Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pokepic #316

Merged
merged 18 commits into from
Jul 21, 2024
Merged

Pokepic #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
102e4ee
sub_02007FD4
PikalaxALT May 1, 2024
c982354
autogen io_reg because fuck it
PikalaxALT May 3, 2024
a2b87d4
sub_02008120
PikalaxALT May 5, 2024
769ef0b
through sub_020085EC
PikalaxALT May 5, 2024
1f4a7fe
through sub_0200878C
PikalaxALT May 5, 2024
63da48b
through sub_020090B4
PikalaxALT May 5, 2024
7060a74
through sub_0200925C
PikalaxALT May 5, 2024
6de4c5f
through sub_02009324
PikalaxALT May 5, 2024
5bab657
through sub_020094E4
PikalaxALT May 6, 2024
a559ec0
through sub_0200994C
PikalaxALT May 7, 2024
cdc504f
finish unk_02007FD8 code
PikalaxALT May 8, 2024
cd28a6f
unk_02007FD8 data to C
PikalaxALT May 8, 2024
07cda82
documentation, 1
PikalaxALT May 8, 2024
17f2b42
documentation, 2
PikalaxALT May 9, 2024
add371a
documentation, 3
PikalaxALT May 10, 2024
4aa485c
rename unk_02007FD8 -> pokepic
PikalaxALT May 10, 2024
c0ca2d6
address review comments
PikalaxALT Jul 19, 2024
f406db3
address review comments, 2
PikalaxALT Jul 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endforeach()

add_executable(PokeHeartGold ${SOURCES})
target_include_directories(PokeHeartGold PUBLIC include files ${CMAKE_SOURCE_DIR}/lib/include ${CMAKE_SOURCE_DIR}/lib/include/cw ${CMAKE_SOURCE_DIR}/lib/include/nitro ${CMAKE_SOURCE_DIR}/lib/include/nnsys ${CMAKE_SOURCE_DIR}/lib/include/nitro/os include/library)
target_compile_definitions(PokeHeartGold PUBLIC __CLION_IDE__ SDK_ARM9 SDK_CW SDK_CODE_ARM _NITRO __arm PLATFORM_INTRINSIC_FUNCTION_BIT_CLZ32=__builtin_clz wchar_t=__WCHAR_TYPE__ PM_KEEP_ASSERTS)
target_compile_definitions(PokeHeartGold PUBLIC __CLION_IDE__ SDK_ARM9 SDK_CW SDK_CODE_ARM SDK_TS _NITRO __arm PLATFORM_INTRINSIC_FUNCTION_BIT_CLZ32=__builtin_clz wchar_t=__WCHAR_TYPE__ PM_KEEP_ASSERTS)
target_compile_options(PokeHeartGold PRIVATE -Wimplicit -Wno-endif-labels -fms-extensions -nostdinc -Wno-builtin-declaration-mismatch -Wno-implicit-int -Wno-multichar -Wno-address-of-packed-member -mcpu=arm946e-s)
target_compile_features(PokeHeartGold PRIVATE c_std_99 cxx_std_98)

Expand Down
24 changes: 12 additions & 12 deletions asm/include/overlay_07.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
.public GfGfxLoader_LoadScrnData
.public GfGfxLoader_LoadFromNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public sub_020087A4
.public sub_02008A78
.public sub_02008C2C
.public sub_0200908C
.public sub_020090B4
.public sub_02009138
.public sub_02009324
.public sub_02009334
.public sub_02009390
.public sub_02009414
.public sub_020094BC
.public Pokepic_SetAttr
.public Pokepic_GetAttr
.public Pokepic_AddAttr
.public Pokepic_SetVisible
.public Pokepic_StartPaletteFade
.public Pokepic_ResumePaletteFade
.public Pokepic_ScheduleReloadFromNarc
.public Pokepic_Push
.public Pokepic_Pop
.public Pokepic_GetTemplate
.public Pokepic_IsActive
.public G2dRenderer_SetSubSurfaceCoords
.public StartBrightnessTransition
.public ScreenBrightnessData_InitAll
Expand Down Expand Up @@ -160,7 +160,7 @@
.public SealOnCapsuleGetY
.public GetMonData
.public GetMonSpriteCharAndPlttNarcIdsEx
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public sub_02071FDC
.public sub_020729D8
.public sub_020729FC
Expand Down
10 changes: 5 additions & 5 deletions asm/include/overlay_12_022378C0.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
.public NARC_Delete
.public GfGfxLoader_LoadCharData
.public GfGfxLoader_LoadScrnData
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_02009408
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_SetPlttBaseAddrAndSize
.public PokepicManager_HandleLoadImgAndOrPltt
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public sub_0200A080
Expand Down
12 changes: 6 additions & 6 deletions asm/include/overlay_12_battle_command.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
.public OverlayManager_Delete
.public OverlayManager_Run
.public GfGfxLoader_LoadFromNarc
.public sub_020085EC
.public sub_0200878C
.public sub_020087A4
.public sub_02008A78
.public sub_02008C2C
.public sub_020090E4
.public PokepicManager_CreatePokepic
.public PokepicManager_DeleteAllPics
.public Pokepic_SetAttr
.public Pokepic_GetAttr
.public Pokepic_AddAttr
.public Pokepic_StartPaletteFadeAll
.public NewString_ReadMsgData
.public BufferBoxMonNickname
.public BufferIntegerAsString
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_12_battle_controller.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.public GetMonData
.public GetPercentProgressTowardsNextLevel
.public GetMonExpBySpeciesAndLevel
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public MaskOfFlagNo
.public GetMoveMaxPP
.public Party_GetCount
Expand Down
36 changes: 18 additions & 18 deletions asm/include/overlay_12_battle_controller_opponent.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@
.public IsCryFinished
.public NARC_New
.public NARC_Delete
.public sub_02008550
.public sub_020085DC
.public sub_020085EC
.public sub_02008634
.public sub_02008780
.public sub_020087A4
.public sub_02008A78
.public sub_02008C2C
.public sub_0200908C
.public sub_020090B4
.public sub_020090E4
.public sub_02009138
.public Pokepic_StartAnim
.public Pokepic_IsAnimFinished
.public PokepicManager_CreatePokepic
.public PokepicManager_CreatePokepicAt
.public Pokepic_Delete
.public Pokepic_SetAttr
.public Pokepic_GetAttr
.public Pokepic_AddAttr
.public Pokepic_SetVisible
.public Pokepic_StartPaletteFade
.public Pokepic_StartPaletteFadeAll
.public Pokepic_ResumePaletteFade
.public sub_0200914C
.public sub_02009324
.public sub_02009414
.public sub_020094D8
.public sub_020094E4
.public Pokepic_ScheduleReloadFromNarc
.public Pokepic_GetTemplate
.public PokepicManager_SetG3UpdateFlagsMask
.public PokepicManager_ResetG3UpdateFlagsMask
.public StartBrightnessTransition
.public IsBrightnessTransitionActive
.public SpriteGfxHandler_UnloadCharObjById
Expand Down Expand Up @@ -73,14 +73,14 @@
.public GetMonBaseStat
.public GetNatureFromPersonality
.public GetMonSpriteCharAndPlttNarcIdsEx
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public sub_02070C24
.public sub_02070D84
.public CopyPokemonToPokemon
.public sub_0207204C
.public MaskOfFlagNo
.public TrainerClassToBackpicID
.public sub_02072914
.public NARC_ReadPokepicAnimScript
.public sub_0207294C
.public sub_020729A4
.public sub_020729D8
Expand Down
8 changes: 4 additions & 4 deletions asm/include/overlay_18.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
.public GfGfxLoader_GetCharDataFromOpenNarc
.public GfGfxLoader_GetScrnDataFromOpenNarc
.public GfGfxLoader_LoadFromOpenNarc
.public sub_020085EC
.public sub_020090B4
.public sub_02009138
.public PokepicManager_CreatePokepic
.public Pokepic_StartPaletteFade
.public Pokepic_ResumePaletteFade
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
Expand Down Expand Up @@ -238,7 +238,7 @@
.public GetMonBaseStat_HandleAlternateForm
.public GetPokemonSpriteCharAndPlttNarcIds
.public GetMonSpriteCharAndPlttNarcIdsEx
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public GetBattleMonIconNaixEx
.public GetBattleMonIconPaletteEx
.public sub_02074490
Expand Down
16 changes: 8 additions & 8 deletions asm/include/overlay_40.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
.public GfGfxLoader_LoadFromNarc_GetSizeOut
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public PokepicManager_HandleLoadImgAndOrPltt
.public G2dRenderer_SetSubSurfaceCoords
.public sub_02009FE8
.public sub_0200A080
Expand Down Expand Up @@ -254,7 +254,7 @@
.public GetGenderBySpeciesAndPersonality
.public CalcShininessByOtIdAndPersonality
.public GetMonSpriteCharAndPlttNarcIdsEx
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public PCStorage_IsBonusWallpaperUnlocked
.public GetMonIconNaixEx
.public GetMonIconPaletteEx
Expand Down
24 changes: 12 additions & 12 deletions asm/include/overlay_41.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_GXLoadPalFromOpenNarc
.public GfGfxLoader_LoadFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_02008A78
.public sub_020093FC
.public sub_02009408
.public sub_02009418
.public sub_020094B0
.public sub_02009D28
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public Pokepic_GetAttr
.public PokepicManager_SetCharBaseAddrAndSize
.public PokepicManager_SetPlttBaseAddrAndSize
.public PokepicManager_HandleLoadImgAndOrPltt
.public PokepicManager_SetNeedG3IdentityFlag
.public UnscanPokepic
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pokepic_Unscan

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this does not operate on the Pokepic class

.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
Expand Down
24 changes: 12 additions & 12 deletions asm/include/overlay_57.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
.public GfGfxLoader_GetCharData
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_02008550
.public sub_020085DC
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_02008A78
.public sub_02008C2C
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public Pokepic_StartAnim
.public Pokepic_IsAnimFinished
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public Pokepic_GetAttr
.public Pokepic_AddAttr
.public sub_0200914C
.public sub_02009418
.public PokepicManager_HandleLoadImgAndOrPltt
.public NewMsgDataFromNarc
.public DestroyMsgData
.public NewString_ReadMsgData
Expand Down Expand Up @@ -196,7 +196,7 @@
.public GetPokemonSpriteCharAndPlttNarcIds
.public sub_0207083C
.public CopyPokemonToPokemon
.public sub_02072914
.public NARC_ReadPokepicAnimScript
.public sub_0207294C
.public Pokemon_GetIconNaix
.public GetMonIconPaletteEx
Expand Down
20 changes: 10 additions & 10 deletions asm/include/overlay_59.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
.public GfGfxLoader_LoadCharDataFromOpenNarc
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public GfGfxLoader_GXLoadPalFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_02008C2C
.public sub_020090B4
.public sub_02009138
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public Pokepic_AddAttr
.public Pokepic_StartPaletteFade
.public Pokepic_ResumePaletteFade
.public PokepicManager_HandleLoadImgAndOrPltt
.public sub_0200B2E0
.public sub_0200B2E8
.public NewMsgDataFromNarc
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_64.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
.public GetGenderBySpeciesAndPersonality
.public CalcShininessByOtIdAndPersonality
.public GetMonSpriteCharAndPlttNarcIdsEx
.public GetMonPicHeightBySpeciesGenderForme
.public GetMonPicHeightBySpeciesGenderForm
.public sub_020729D8
.public NNS_G2dGetImageLocation
.public NNS_G2dGetImagePaletteLocation
Expand Down
12 changes: 6 additions & 6 deletions asm/include/overlay_68.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
.public NARC_New
.public NARC_Delete
.public GfGfxLoader_GetScrnDataFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_020085EC
.public sub_020087A4
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_CreatePokepic
.public Pokepic_SetAttr
.public PokepicManager_HandleLoadImgAndOrPltt
.public NewMsgDataFromNarc
.public DestroyMsgData
.public ReadMsgDataIntoString
Expand Down
22 changes: 11 additions & 11 deletions asm/include/overlay_71.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
.public GfGfxLoader_GetCellBank
.public GfGfxLoader_GetAnimBank
.public GfGfxLoader_LoadFromNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_02008550
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_020093FC
.public sub_02009408
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public Pokepic_StartAnim
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public PokepicManager_SetCharBaseAddrAndSize
.public PokepicManager_SetPlttBaseAddrAndSize
.public PokepicManager_HandleLoadImgAndOrPltt
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
.public OamManager_Create
Expand Down Expand Up @@ -140,7 +140,7 @@
.public GetMonBaseStat_HandleAlternateForm
.public GetBoxmonSpriteCharAndPlttNarcIds
.public sub_02070854
.public sub_02072914
.public NARC_ReadPokepicAnimScript
.public sub_020729A4
.public NNS_G2dSetupSoftwareSpriteCamera
.public NNS_G2dInitOamManagerModule
Expand Down
18 changes: 9 additions & 9 deletions asm/include/overlay_81.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@
.public GfGfxLoader_LoadScrnDataFromOpenNarc
.public GfGfxLoader_GXLoadPalFromOpenNarc
.public GfGfxLoader_GetScrnDataFromOpenNarc
.public sub_02007FD4
.public sub_02008120
.public sub_02008524
.public sub_020085EC
.public sub_02008780
.public sub_020087A4
.public sub_020090E4
.public sub_02009138
.public sub_02009418
.public PokepicManager_Create
.public PokepicManager_DrawAll
.public PokepicManager_Delete
.public PokepicManager_CreatePokepic
.public Pokepic_Delete
.public Pokepic_SetAttr
.public Pokepic_StartPaletteFadeAll
.public Pokepic_ResumePaletteFade
.public PokepicManager_HandleLoadImgAndOrPltt
.public CreateSpriteResourcesHeader
.public G2dRenderer_Init
.public G2dRenderer_SetSubSurfaceCoords
Expand Down
Loading