docvumentation, 1

This commit is contained in:
PikalaxALT 2024-10-01 20:12:42 -04:00
parent 232dc989d1
commit 9bfbad8e01
No known key found for this signature in database
GPG Key ID: 7774E96AA69E5B61
67 changed files with 558 additions and 544 deletions

View File

@ -27,7 +27,7 @@
.public sub_0200B00C
.public sub_0200B050
.public sub_0200B0CC
.public sub_0200B12C
.public GF_PlttResObj_GetVramSlotNum
.public AllocFromHeap
.public FreeToHeap
.public SpriteList_Delete

View File

@ -41,7 +41,7 @@
.public sub_0200AF00
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public NewMsgDataFromNarc
.public DestroyMsgData
.public NewString_ReadMsgData

View File

@ -48,7 +48,7 @@
.public SpriteRenderer_LoadCellResObjFromOpenNarc
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
.public UnkImageStruct_Delete
.public UnkImageStruct_SetSpriteAnimSeqNo

View File

@ -41,7 +41,7 @@
.public sub_0200B00C
.public sub_0200B084
.public sub_0200B0CC
.public sub_0200B12C
.public GF_PlttResObj_GetVramSlotNum
.public sub_0200B2E0
.public sub_0200B2E8
.public SpriteRenderer_Create

View File

@ -58,7 +58,7 @@
.public SpriteRenderer_GetG2dRendererPtr
.public thunk_Sprite_Delete
.public SpriteRenderer_CreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public thunk_Sprite_SetPriority
.public thunk_Sprite_SetDrawPriority
.public Sprite_SetPositionXY

View File

@ -58,7 +58,7 @@
.public SpriteRenderer_Delete
.public sub_0200D2A4
.public SpriteRenderer_CreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public UnkImageStruct_Delete
.public thunk_Set2dSpriteVisibleFlag
.public thunk_Sprite_SetPriority

View File

@ -51,7 +51,7 @@
.public sub_0200AF00
.public sub_0200AF94
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_Free
.public NewMsgDataFromNarc

View File

@ -13,7 +13,7 @@
.public SpriteRenderer_LoadCellResObjFromOpenNarc
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D944
.public GfGfxHandler_GetPlttNumById
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteGfxHandler_UnloadCellObjById
.public SpriteGfxHandler_UnloadAnimObjById
@ -40,7 +40,7 @@
.public String_New
.public String_Delete
.public Mon_GetBoxMon
.public sub_02088080
.public HpBar_GetColorIdx
.public MIi_CpuCopy16
.public MI_CpuFill8
.public abs
@ -70,7 +70,7 @@
.public ov12_02264EE0
.public BattleHpBar_SetEnabled
.public ov12_02264FB0
.public ov12_02265B64
.public ov12_02265C54
.public BattleHpBar_Util_GetBarTypeFromBattlerSide
.public BattleHpBar_BeginExpBarFullFlashEffect
.public ov12_02265D70
.public ov12_02265D74

View File

@ -34,7 +34,7 @@
.public SpriteRenderer_LoadAnimResObjFromNarcId
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteGfxHandler_UnloadPlttObjById
.public SpriteGfxHandler_UnloadCellObjById

View File

@ -26,7 +26,7 @@
.public SpriteRenderer_LoadCellResObjFromNarcId
.public SpriteRenderer_LoadAnimResObjFromNarcId
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteGfxHandler_UnloadPlttObjById
.public SpriteGfxHandler_UnloadCellObjById

View File

@ -272,8 +272,8 @@
.public ov12_02264EB4
.public BattleHpBar_SetEnabled
.public ov12_02264FB0
.public ov12_02265B64
.public ov12_02265C54
.public BattleHpBar_Util_GetBarTypeFromBattlerSide
.public BattleHpBar_BeginExpBarFullFlashEffect
.public ov12_02265D70
.public ov12_02265D74
.public ov12_02266508

View File

@ -65,7 +65,7 @@
.public SpriteRenderer_LoadAnimResObjFromNarcId
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public SpriteRenderer_LoadResourcesAndCreateSprite_CustomBottomScreenOffset
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
.public UnkImageStruct_Delete
.public UnkImageStruct_TickSpriteAnimation1Frame

View File

@ -57,7 +57,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B12C
.public GF_PlttResObj_GetVramSlotNum
.public NewMsgDataFromNarc
.public DestroyMsgData
.public ReadMsgDataIntoString
@ -91,7 +91,7 @@
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public SpriteRenderer_LoadResourcesAndCreateSprite_CustomBottomScreenOffset
.public sub_0200D944
.public GfGfxHandler_GetPlttNumById
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteGfxHandler_UnloadPlttObjById
.public SpriteGfxHandler_UnloadCellObjById

View File

@ -67,7 +67,7 @@
.public SpriteRenderer_LoadAnimResObjFromNarcId
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteGfxHandler_UnloadPlttObjById
.public SpriteGfxHandler_UnloadCellObjById

View File

@ -55,7 +55,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_ApplyAndResetBuffers
.public OamManager_Free

View File

@ -20,7 +20,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B12C
.public GF_PlttResObj_GetVramSlotNum
.public AllocFromHeap
.public FreeToHeap
.public InitBgFromTemplate

View File

@ -57,7 +57,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_ApplyAndResetBuffers
.public OamManager_Free

View File

@ -57,7 +57,7 @@
.public SpriteRenderer_LoadAnimResObjFromNarcId
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteGfxHandler_UnloadCharObjById
.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
.public UnkImageStruct_Delete

View File

@ -21,7 +21,7 @@
.public SpriteRenderer_LoadCellResObjFromOpenNarc
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public UnkImageStruct_Delete
.public TickSpriteAnimation1Frame
.public UnkImageStruct_SetSpriteVisibleFlag

View File

@ -57,7 +57,7 @@
.public SpriteRenderer_LoadCellResObjFromOpenNarc
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public SpriteRenderer_UnloadResourcesAndRemoveGfxHandler
.public UnkImageStruct_Delete
.public TickSpriteAnimation1Frame

View File

@ -34,7 +34,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B12C
.public GF_PlttResObj_GetVramSlotNum
.public OamManager_Create
.public OamManager_ApplyAndResetBuffers
.public OamManager_Free

View File

@ -31,7 +31,7 @@
.public sub_0200AEB0
.public sub_0200B00C
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_ApplyAndResetBuffers
.public OamManager_Free

View File

@ -15,8 +15,8 @@
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public NewString_ReadMsgData
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public sub_0200D944
.public GfGfxHandler_GetPlttProxy
.public GfGfxHandler_GetPlttNumById
.public UnkImageStruct_Delete
.public TickSpriteAnimation1Frame
.public UnkImageStruct_TickSpriteAnimationNFrames

View File

@ -72,7 +72,7 @@
.public sub_0200AF00
.public sub_0200AF94
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_ApplyAndResetBuffers
.public OamManager_Free

View File

@ -24,7 +24,7 @@
.public sub_0200AF00
.public sub_0200AF94
.public sub_0200B0A8
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public OamManager_Create
.public OamManager_Free
.public NewMsgDataFromNarc

View File

@ -11,7 +11,7 @@
.public PokepicManager_Delete
.public Get2DGfxResObjById
.public sub_0200AF00
.public sub_0200B0F8
.public GF_PlttResObj_GetPlttProxy
.public UnkImageStruct_Delete
.public SysTask_CreateOnVBlankQueue
.public SysTask_CreateOnVWaitQueue

View File

@ -20,7 +20,7 @@
.public SpriteRenderer_LoadCellResObjFromOpenNarc
.public SpriteRenderer_LoadAnimResObjFromOpenNarc
.public SpriteRenderer_LoadResourcesAndCreateSprite
.public sub_0200D934
.public GfGfxHandler_GetPlttProxy
.public UnkImageStruct_Delete
.public UnkImageStruct_TickSpriteAnimation1Frame
.public UnkImageStruct_SetSpriteAnimSeqNo

View File

@ -525,7 +525,7 @@ _021E83CC:
bl ov01_021E847C
ldr r1, [sp, #0x2c]
add r0, r4, #0
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add sp, #0x10
pop {r3, r4, r5, r6, r7, pc}
_021E83E4:

View File

@ -10239,7 +10239,7 @@ ov02_0224A88C: ; 0x0224A88C
mov r1, #3
bl Get2DGfxResObjById
add r1, r6, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
mov r1, #1
bl NNS_G2dGetImagePaletteLocation
add r5, r0, #0

View File

@ -3418,7 +3418,7 @@ ov05_0221D530: ; 0x0221D530
lsl r0, r0, #2
ldr r0, [r4, r0]
ldr r1, _0221D5D4 ; =0x0000B807
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
mov r1, #0x3e
lsl r2, r6, #4
lsl r1, r1, #4

View File

@ -2500,7 +2500,7 @@ _021E6BE0:
bl Sprite_SetAnimCtrlSeq
add r0, r7, #0
add r1, r6, #0
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
ldr r1, _021E6C40 ; =ov100_021E770C
add r2, r0, #0
ldrb r1, [r1, r5]

View File

@ -2558,7 +2558,7 @@ ov101_021E8AE4: ; 0x021E8AE4
mov r1, #0
add r0, #0x90
ldr r0, [r0]
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x24]
mov r0, #0
str r0, [sp, #0x10]

View File

@ -3607,7 +3607,7 @@ ov108_021E756C: ; 0x021E756C
lsl r0, r0, #4
ldr r0, [r5, r0]
mov r1, #0
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x1c]
mov r0, #3
str r0, [sp, #0x30]

View File

@ -22288,7 +22288,7 @@ ov112_021F0C50: ; 0x021F0C50
add r6, r0, #0
add r0, r4, #0
add r1, r6, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
add r4, r0, #0
add r0, r6, #0
mov r1, #2

View File

@ -4534,7 +4534,7 @@ _02268602:
str r0, [sp, #0x54]
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x98]
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x58]
mov r0, #0
ldr r1, [sp, #0x34]

View File

@ -4025,7 +4025,7 @@ _022483C6:
str r0, [sp, #0x34]
ldr r1, _022484AC ; =0x00004E30
add r0, r4, #0
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
mov r1, #0
str r0, [sp, #0x38]
ldr r0, [sp, #0x60]

View File

@ -3678,7 +3678,7 @@ ov12_0225A414: ; 0x0225A414
add r1, r0, #0
ldr r0, _0225A4D4 ; =0x00000195
ldrb r0, [r6, r0]
bl ov12_02265B64
bl BattleHpBar_Util_GetBarTypeFromBattlerSide
add r1, r4, #0
add r1, #0x25
strb r0, [r1]
@ -4445,7 +4445,7 @@ _0225A9F2:
add r1, r0, #0
ldr r0, _0225AA60 ; =0x00000195
ldrb r0, [r6, r0]
bl ov12_02265B64
bl BattleHpBar_Util_GetBarTypeFromBattlerSide
add r1, r4, #0
add r1, #0x25
strb r0, [r1]
@ -5147,7 +5147,7 @@ ov12_0225AF74: ; 0x0225AF74
add r1, r0, #0
ldr r0, _0225B024 ; =0x00000195
ldrb r0, [r6, r0]
bl ov12_02265B64
bl BattleHpBar_Util_GetBarTypeFromBattlerSide
add r1, r4, #0
add r1, #0x25
strb r0, [r1]
@ -13192,7 +13192,7 @@ _0225F070:
bl BattleSystem_GetBattleType
add r1, r0, #0
ldr r0, [sp, #0x18]
bl ov12_02265B64
bl BattleHpBar_Util_GetBarTypeFromBattlerSide
add r1, r5, #0
add r1, #0x25
strb r0, [r1]
@ -15802,7 +15802,7 @@ ov12_02260584: ; 0x02260584
_02260596:
ldr r0, [r4, #4]
add r1, #0xb
bl ov12_02265C54
bl BattleHpBar_BeginExpBarFullFlashEffect
ldr r0, _022605CC ; =0x0000070C
bl PlaySE
ldrb r0, [r4, #0xa]

View File

@ -30846,7 +30846,7 @@ ov14_021F4D10: ; 0x021F4D10
lsl r0, r0, #2
ldr r0, [r4, r0]
ldr r1, _021F4E5C ; =0x0000C101
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x14]
mov r0, #0xc6
lsl r0, r0, #2
@ -30914,7 +30914,7 @@ ov14_021F4D10: ; 0x021F4D10
lsl r0, r0, #2
ldr r0, [r4, r0]
ldr r1, _021F4E5C ; =0x0000C101
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x14]
mov r0, #0xc6
lsl r0, r0, #2

View File

@ -23188,7 +23188,7 @@ ov18_021F14B4: ; 0x021F14B4
ldr r1, _021F14F8 ; =0x0000C550
mov r2, #1
add r6, r3, #0
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
mov r3, #1
add r7, r0, #0
str r3, [sp]
@ -23262,7 +23262,7 @@ ov18_021F1534: ; 0x021F1534
ldr r1, _021F1594 ; =0x0000C551
ldr r0, [r5, r0]
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
add r6, r0, #0
ldr r1, [sp, #4]
add r0, r7, #0
@ -24290,7 +24290,7 @@ ov18_021F1D98: ; 0x021F1D98
ldr r1, _021F1DE0 ; =0x0000C55B
ldr r0, [r6, r0]
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
add r1, r0, #0
ldr r0, [r5, r4]
bl UnkImageStruct_SetSpritePalIndex
@ -24819,7 +24819,7 @@ ov18_021F21FC: ; 0x021F21FC
ldr r1, _021F226C ; =0x0000C558
ldr r0, [r5, r0]
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
add r6, r0, #0
ldr r0, [sp, #4]
bl ov18_021F9688
@ -25113,7 +25113,7 @@ _021F248A:
ldr r1, _021F24D8 ; =0x0000C55A
ldr r0, [r7, r0]
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
add r1, r0, #0
mov r0, #0x67
lsl r0, r0, #4
@ -26783,7 +26783,7 @@ _021F3214:
ldr r1, _021F3290 ; =0x0000C55A
ldr r0, [r5, r0]
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
add r1, r0, #0
mov r0, #0x67
lsl r0, r0, #4
@ -38793,7 +38793,7 @@ ov18_021F8FF8: ; 0x021F8FF8
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #1
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add r2, r0, #0
lsl r2, r2, #0x14
ldr r0, [r4, #4]
@ -38883,7 +38883,7 @@ ov18_021F9068: ; 0x021F9068
lsl r0, r0, #2
ldr r0, [r4, r0]
mov r1, #1
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add r2, r0, #0
lsl r2, r2, #0x14
ldr r0, [r4, #4]
@ -38982,7 +38982,7 @@ ov18_021F9150: ; 0x021F9150
str r0, [r5, r1]
ldr r0, [r5, r1]
mov r1, #1
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add r2, r0, #0
lsl r2, r2, #0x14
ldr r0, [r5, #4]

View File

@ -3511,7 +3511,7 @@ _0222D2E6:
ldr r1, [sp, #0xc]
ldr r0, [r6, #0x1c]
ldr r1, [r1]
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x58]
ldr r0, [r4]
add r1, sp, #0x20
@ -3845,7 +3845,7 @@ _0222D5BE:
str r0, [sp, #0x24]
ldr r0, [r4, #8]
add r1, r6, #0
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x28]
ldr r0, [r5, #4]
add r1, sp, #8

View File

@ -9928,7 +9928,7 @@ ov41_0224A734: ; 0x0224A734
ldr r0, [r4, #0x4c]
bl Get2DGfxResObjById
mov r1, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0x98]
ldr r0, [sp, #0xb8]
mov r1, #1

View File

@ -1975,11 +1975,11 @@ ov42_02227E78: ; 0x02227E78
str r0, [sp, #4]
add r0, r6, #0
mov r1, #1
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add r7, r0, #0
add r0, r6, #0
mov r1, #2
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
add r6, r0, #0
mov r0, #0
mvn r0, r0

View File

@ -14918,7 +14918,7 @@ _02231604:
str r0, [sp, #0x40]
ldr r0, _0223168C ; =0x00000D2C
ldr r0, [r5, r0]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0x44]
ldr r0, _022316A4 ; =0x00000D3C
ldr r1, [r5, r0]

View File

@ -2004,7 +2004,7 @@ ov57_022387E0: ; 0x022387E0
add r0, #0xe0
ldr r0, [r0]
ldr r1, _022388E0 ; =0x00007530
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x38]
mov r2, #0
mov r0, #0x9b

View File

@ -849,7 +849,7 @@ _0223A6D6:
str r0, [sp, #0x54]
ldr r0, [sp, #0x20]
ldr r1, [sp, #0x98]
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
mov r1, #0
str r0, [sp, #0x58]
ldr r0, [sp, #0x34]

View File

@ -3232,7 +3232,7 @@ _0225A2E6:
str r0, [sp, #0x50]
ldr r1, [sp, #0x98]
add r0, r7, #0
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
mov r1, #0
str r0, [sp, #0x54]
ldr r0, [sp, #0x30]

View File

@ -658,7 +658,7 @@ ov90_02258C74: ; 0x02258C74
ldr r1, _02258C88 ; =0x00001388
bl Get2DGfxResObjById
mov r1, #1
bl sub_0200B12C
bl GF_PlttResObj_GetVramSlotNum
pop {r3, pc}
nop
_02258C88: .word 0x00001388

View File

@ -10689,7 +10689,7 @@ _022616FA:
ldr r0, [r4, #0x1c]
str r0, [sp, #0x34]
ldr r0, [r5, #0x60]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0x38]
ldr r0, [r5, #0x34]
str r0, [sp, #0x3c]

View File

@ -2222,7 +2222,7 @@ ov93_02260CF8: ; 0x02260CF8
ldr r0, [r7, #0x28]
ldr r1, _02260E10 ; =0x00002716
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
str r0, [sp, #0xc]
mov r0, #0
str r0, [sp, #0x18]
@ -2372,7 +2372,7 @@ ov93_02260E1C: ; 0x02260E1C
ldr r0, [r5, #0x28]
ldr r1, _02260F08 ; =0x00002716
mov r2, #2
bl sub_0200D944
bl GfGfxHandler_GetPlttNumById
str r0, [sp, #4]
mov r0, #0
str r0, [sp, #0x10]
@ -4569,7 +4569,7 @@ _02261F42:
str r0, [sp, #0x48]
ldr r0, [sp, #0x1c]
ldr r1, [sp, #0x98]
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x4c]
mov r0, #0
str r0, [sp, #0x50]

View File

@ -6930,7 +6930,7 @@ _021E8C14:
ldr r0, [r6, r0]
add r0, r0, r5
ldr r0, [r0, #4]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
add r5, r0, #0
add r0, r7, #0
mov r1, #0x20
@ -7071,7 +7071,7 @@ _021E8CC2:
str r0, [sp, #0x24]
ldr r0, [r4, #4]
ldr r1, [sp, #0x24]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0x28]
ldr r0, [r4]
bl GF2DGfxResObj_GetCharDataPtr
@ -30732,7 +30732,7 @@ _021F4420:
add r7, r0, #0
ldr r0, [sp, #4]
add r1, r7, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0xc]
add r0, r7, #0
mov r1, #2
@ -40043,7 +40043,7 @@ ov96_021F8DF4: ; 0x021F8DF4
mov r0, #0xb1
lsl r0, r0, #2
ldr r0, [r5, r0]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #0x34]
ldr r0, [sp, #0x78]
str r0, [sp, #0x38]
@ -55972,7 +55972,7 @@ _02200D90:
add r6, r0, #0
add r0, r5, #0
add r1, r6, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #8]
ldr r1, [sp]
ldr r0, [sp, #4]
@ -62143,7 +62143,7 @@ ov96_02203F50: ; 0x02203F50
add r7, r0, #0
add r0, r5, #0
add r1, r7, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp]
mov r4, #0
_02203F80:
@ -71471,7 +71471,7 @@ _022089E4:
add r6, r0, #0
add r0, r5, #0
add r1, r6, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
str r0, [sp, #8]
ldr r1, [sp]
ldr r0, [sp, #4]

View File

@ -2710,7 +2710,7 @@ ov97_0221FBA0: ; 0x0221FBA0
add r6, r0, #0
add r0, r4, #0
add r1, r6, #0
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
add r4, r0, #0
add r0, r6, #0
mov r1, #2

View File

@ -2572,7 +2572,7 @@ sub_0200F748: ; 0x0200F748
ldr r1, _0200F828 ; =0x00015CD5
bl Get2DGfxResObjById
ldr r1, [sp, #4]
bl sub_0200B0F8
bl GF_PlttResObj_GetPlttProxy
mov r1, #1
bl NNS_G2dGetImagePaletteLocation
add r5, r0, #0

View File

@ -1738,7 +1738,7 @@ sub_02087090: ; 0x02087090
str r0, [sp, #0x34]
ldr r0, [r5, r1]
add r1, #0xf7
bl sub_0200D934
bl GfGfxHandler_GetPlttProxy
str r0, [sp, #0x38]
mov r1, #0
mov r0, #0xe2

View File

@ -459,7 +459,7 @@ typedef struct BattleHpBar {
s32 maxExp;
s32 gainedExp;
s32 expCalc;
u8 unk48;
u8 level;
u8 unk49;
u8 unk_4A;
u8 unk4B;

View File

@ -16,8 +16,8 @@ void ov12_02264EB4(BattleHpBar *hpBar);
void ov12_02264EE0(BattleHpBar *hpBar, int prio);
void BattleHpBar_SetEnabled(BattleHpBar *hpBar, BOOL a1);
void ov12_02264FB0(BattleHpBar *hpBar, BOOL a1);
u8 ov12_02265B64(u8 a0, u32 battleType);
SysTask *ov12_02265C54(BattleHpBar *hpBar, u8 *a1);
u8 BattleHpBar_Util_GetBarTypeFromBattlerSide(u8 a0, u32 battleType);
SysTask *BattleHpBar_BeginExpBarFullFlashEffect(BattleHpBar *hpBar, u8 *a1);
void ov12_02265D70(BattleHpBar *hpBar);
void ov12_02265D74(BattleHpBar *hpBar);

View File

@ -23,7 +23,7 @@ void sub_0200B050(GF_2DGfxResObjList *plttResObjList);
void sub_0200B084(GF_2DGfxResObj *plttResObj);
void sub_0200B0A8(GF_2DGfxResObj *plttResObj);
void sub_0200B0CC(GF_2DGfxResObjList *plttResObjList);
NNSG2dImagePaletteProxy *sub_0200B0F8(GF_2DGfxResObj *plttResObj, NNSG2dImageProxy *imageProxy);
int sub_0200B12C(GF_2DGfxResObj *plttResObj, NNS_G2D_VRAM_TYPE vram);
NNSG2dImagePaletteProxy *GF_PlttResObj_GetPlttProxy(GF_2DGfxResObj *plttResObj, NNSG2dImageProxy *imageProxy);
int GF_PlttResObj_GetVramSlotNum(GF_2DGfxResObj *plttResObj, NNS_G2D_VRAM_TYPE vram);
#endif // POKEHEARTGOLD_UNK_0200ACF0_H

View File

@ -111,8 +111,8 @@ BOOL SpriteRenderer_LoadAnimResObjFromNarcId(SpriteRenderer *renderer, SpriteGfx
BOOL SpriteRenderer_LoadAnimResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, NARC *narc, int fileId, BOOL compressed, int resId);
UnkImageStruct *SpriteRenderer_LoadResourcesAndCreateSprite(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, const UnkTemplate_0200D748 *unkTemplate);
UnkImageStruct *SpriteRenderer_LoadResourcesAndCreateSprite_CustomBottomScreenOffset(SpriteRenderer *renderer, SpriteGfxHandler *gfxHandler, const UnkTemplate_0200D748 *unkTemplate, fx32 yOffset);
NNSG2dImagePaletteProxy *sub_0200D934(SpriteGfxHandler *gfxHandler, int id);
int sub_0200D944(SpriteGfxHandler *gfxHandler, int id, NNS_G2D_VRAM_TYPE vram);
NNSG2dImagePaletteProxy *GfGfxHandler_GetPlttProxy(SpriteGfxHandler *gfxHandler, int id);
int GfGfxHandler_GetPlttNumById(SpriteGfxHandler *gfxHandler, int id, NNS_G2D_VRAM_TYPE vram);
BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler *gfxHandler, u32 character);
BOOL SpriteGfxHandler_UnloadPlttObjById(SpriteGfxHandler *gfxHandler, u32 pal);
BOOL SpriteGfxHandler_UnloadCellObjById(SpriteGfxHandler *gfxHandler, u32 cell);

View File

@ -7,7 +7,7 @@
u16 sub_0208805C(int a0);
u8 CalculateHpBarPixelsLength(u32 hp, u32 maxHp, u8 pixelsWide);
u8 sub_02088080(u32 hp, u32 pixelsWide);
u8 HpBar_GetColorIdx(u32 pixelsCur, u32 pixelsWide);
u8 CalculateHpBarColor(u16 hp, u16 maxHp, u32 pixelsWide);
void sub_020880CC(u8 a0, HeapID heapId);
int sub_020881C0(s16 *a0, u16 a1);

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
// clang-format off
ALIGN(4) const u8 ov12_0226D6E0[] = {
ALIGN(4) const u8 gBattleHpBar_RawGraphicComponents[] = {
// 0x00
0xE3, 0xEE, 0xEE, 0xEE, 0xEE, 0x88, 0x8E, 0xE8, 0xEE, 0x88, 0x8E, 0xE8, 0xEE, 0x88, 0x88, 0xE8, 0xEE, 0x88, 0x8E, 0xE8, 0xEE, 0x88, 0x8E, 0xE8, 0xE3, 0xEE, 0xEE, 0xEE, 0x32, 0x33, 0x33, 0x33,
// 0x01

View File

@ -1042,7 +1042,7 @@ void BattleSystem_HpBar_Init(BattleSystem *bsys) {
for (i = 0; i < bsys->maxBattlers; i++) {
hpBar = OpponentData_GetHpBar(bsys->opponentData[i]);
hpBar->bsys = bsys;
hpBar->type = ov12_02265B64(ov12_02261258(bsys->opponentData[i]), BattleSystem_GetBattleType(bsys));
hpBar->type = BattleHpBar_Util_GetBarTypeFromBattlerSide(ov12_02261258(bsys->opponentData[i]), BattleSystem_GetBattleType(bsys));
BattleHpBar_LoadResources(hpBar);
BattleHpBar_SetEnabled(hpBar, FALSE);
}

View File

@ -1201,7 +1201,7 @@ static void loadOneMonObj(GF_2DGfxResMan *charResMan, GF_2DGfxResMan *plttResMan
sub_0200ADA4(charResObj);
sub_0200B00C(plttResObj);
charProxy = sub_0200AF00(charResObj);
plttProxy = sub_0200B0F8(plttResObj, charProxy);
plttProxy = GF_PlttResObj_GetPlttProxy(plttResObj, charProxy);
imageloc = NNS_G2dGetImageLocation(charProxy, NNS_G2D_VRAM_TYPE_2DSUB);
plttloc = NNS_G2dGetImagePaletteLocation(plttProxy, NNS_G2D_VRAM_TYPE_2DSUB);
DC_FlushRange(charData, 0xC80);

View File

@ -930,7 +930,7 @@ static void LoadCutsceneSpriteResources(CreditsAppWork *work) {
GF_2DGfxResObj *charResObj = work->cutsceneRsrs[i].charResObj;
GF_2DGfxResObj *plttResObj = work->cutsceneRsrs[i].plttResObj;
NNSG2dImageProxy *imageProxy = sub_0200AF00(charResObj);
NNSG2dImagePaletteProxy *plttProxy = sub_0200B0F8(plttResObj, imageProxy);
NNSG2dImagePaletteProxy *plttProxy = GF_PlttResObj_GetPlttProxy(plttResObj, imageProxy);
cutsceneWork->spriteGfx[i].imageProxy = imageProxy;
cutsceneWork->spriteGfx[i].plttProxy = plttProxy;

View File

@ -54,7 +54,7 @@ void CreateSpriteResourcesHeader(struct SpriteResourcesHeader *hdr, int charId,
GF_ASSERT(proxy != NULL);
hdr->charData = NULL;
}
hdr->plttProxy = sub_0200B0F8(plttObj, proxy);
hdr->plttProxy = GF_PlttResObj_GetPlttProxy(plttObj, proxy);
hdr->imageProxy = proxy;
hdr->cellData = GF2DGfxResObj_GetCellDataPtr(cellObj);
if (cellAnmObj != NULL) {

View File

@ -198,7 +198,7 @@ void sub_0200B0CC(GF_2DGfxResObjList *plttResObjList) {
}
}
NNSG2dImagePaletteProxy *sub_0200B0F8(GF_2DGfxResObj *plttResObj, NNSG2dImageProxy *imageProxy) {
NNSG2dImagePaletteProxy *GF_PlttResObj_GetPlttProxy(GF_2DGfxResObj *plttResObj, NNSG2dImageProxy *imageProxy) {
GF_ASSERT(plttResObj != NULL);
GF_ASSERT(GF2DGfxResObj_GetResType(plttResObj) == GF_GFX_RES_TYPE_PLTT);
@ -210,8 +210,8 @@ NNSG2dImagePaletteProxy *sub_0200B0F8(GF_2DGfxResObj *plttResObj, NNSG2dImagePro
}
}
int sub_0200B12C(GF_2DGfxResObj *plttResObj, NNS_G2D_VRAM_TYPE vram) {
NNSG2dImagePaletteProxy *plttProxy = sub_0200B0F8(plttResObj, NULL);
int GF_PlttResObj_GetVramSlotNum(GF_2DGfxResObj *plttResObj, NNS_G2D_VRAM_TYPE vram) {
NNSG2dImagePaletteProxy *plttProxy = GF_PlttResObj_GetPlttProxy(plttResObj, NULL);
int location = NNS_G2dGetImagePaletteLocation(plttProxy, vram);
if (location != -1) {
location /= 32;

View File

@ -345,7 +345,7 @@ s8 SpriteRenderer_LoadPlttResObjFromNarcId(SpriteRenderer *renderer, SpriteGfxHa
if (obj != NULL) {
GF_ASSERT(sub_0200B00C(obj) == TRUE);
MyInsertResObjIntoList(gfxHandler->_2dGfxResObjList[GF_GFX_RES_TYPE_PLTT], obj);
return sub_0200B12C(obj, vram);
return GF_PlttResObj_GetVramSlotNum(obj, vram);
}
GF_ASSERT(0);
return -1;
@ -359,7 +359,7 @@ s8 SpriteRenderer_LoadPlttResObjFromOpenNarc(SpriteRenderer *renderer, SpriteGfx
if (obj != NULL) {
GF_ASSERT(sub_0200B00C(obj) == TRUE);
MyInsertResObjIntoList(gfxHandler->_2dGfxResObjList[GF_GFX_RES_TYPE_PLTT], obj);
return sub_0200B12C(obj, vram);
return GF_PlttResObj_GetVramSlotNum(obj, vram);
}
GF_ASSERT(0);
return -1;
@ -487,12 +487,12 @@ static UnkImageStruct *MyLoadResourcesAndCreateSprite(SpriteRenderer *renderer,
return ret;
}
NNSG2dImagePaletteProxy *sub_0200D934(SpriteGfxHandler *gfxHandler, int id) {
return sub_0200B0F8(Get2DGfxResObjById(gfxHandler->_2dGfxResMan[GF_GFX_RES_TYPE_PLTT], id), NULL);
NNSG2dImagePaletteProxy *GfGfxHandler_GetPlttProxy(SpriteGfxHandler *gfxHandler, int id) {
return GF_PlttResObj_GetPlttProxy(Get2DGfxResObjById(gfxHandler->_2dGfxResMan[GF_GFX_RES_TYPE_PLTT], id), NULL);
}
int sub_0200D944(SpriteGfxHandler *gfxHandler, int id, NNS_G2D_VRAM_TYPE vram) {
return sub_0200B12C(Get2DGfxResObjById(gfxHandler->_2dGfxResMan[GF_GFX_RES_TYPE_PLTT], id), vram);
int GfGfxHandler_GetPlttNumById(SpriteGfxHandler *gfxHandler, int id, NNS_G2D_VRAM_TYPE vram) {
return GF_PlttResObj_GetVramSlotNum(Get2DGfxResObjById(gfxHandler->_2dGfxResMan[GF_GFX_RES_TYPE_PLTT], id), vram);
}
BOOL SpriteGfxHandler_UnloadCharObjById(SpriteGfxHandler *gfxHandler, u32 character) {

View File

@ -35,15 +35,15 @@ u8 CalculateHpBarPixelsLength(u32 hp, u32 maxHp, u8 pixelsWide) {
return ret;
}
u8 sub_02088080(u32 hp, u32 pixelsWide) {
hp <<= 8;
u8 HpBar_GetColorIdx(u32 pixelsCur, u32 pixelsWide) {
pixelsCur <<= 8;
pixelsWide <<= 8;
if (hp > pixelsWide / 2) {
if (pixelsCur > pixelsWide / 2) {
return 3; // green
} else if (hp > pixelsWide / 5) {
} else if (pixelsCur > pixelsWide / 5) {
return 2; // yellow
} else if (hp > 0) {
} else if (pixelsCur > 0) {
return 1; // red
}
@ -54,7 +54,7 @@ u8 CalculateHpBarColor(u16 hp, u16 maxHp, u32 pixelsWide) {
if (hp == maxHp) {
return 4;
}
return sub_02088080(CalculateHpBarPixelsLength(hp, maxHp, pixelsWide), pixelsWide);
return HpBar_GetColorIdx(CalculateHpBarPixelsLength(hp, maxHp, pixelsWide), pixelsWide);
}
void sub_020880CC(u8 a0, HeapID heapId) {