Skip to content

Sync pokemon.c with pokeplatinum and pokeheartgold #577

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

Closed
AsparagusEduardo wants to merge 28 commits into from
Closed

Sync pokemon.c with pokeplatinum and pokeheartgold #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ddf6bd4
Sync pokemon.c with pokeheartgold
AsparagusEduardo Dec 24, 2025
3877709
SetData
AsparagusEduardo Dec 24, 2025
448e2dd
Encryption
AsparagusEduardo Dec 24, 2025
d520d49
Pokemon_InitAndCalcStats
AsparagusEduardo Dec 24, 2025
7f477ef
Encryption2
AsparagusEduardo Dec 24, 2025
b208876
Merge branch 'master' into pret/pr/sinjoh/pokemon.c
AsparagusEduardo Dec 24, 2025
8d23c1a
More syncing with pokeheartgold
AsparagusEduardo Dec 25, 2025
7198173
Lots of gfx
AsparagusEduardo Dec 26, 2025
aa6f02e
Pokemon_IncreaseData
AsparagusEduardo Dec 26, 2025
2755d1c
define name sync
AsparagusEduardo Dec 26, 2025
ad16909
Pokérus
AsparagusEduardo Dec 27, 2025
70a58cf
Arceus form
AsparagusEduardo Dec 27, 2025
4336df8
Pokemon_UpdateAbility
AsparagusEduardo Dec 27, 2025
16cc352
Battle facility banned
AsparagusEduardo Dec 27, 2025
645e160
BoxPokemon_BelongsToPlayer
AsparagusEduardo Dec 27, 2025
ab0e675
Wild held item
AsparagusEduardo Dec 27, 2025
9520839
Pokemon_SetPersonality
AsparagusEduardo Dec 27, 2025
9709af5
Flavor affinity
AsparagusEduardo Dec 27, 2025
6aee6ba
Evolution
AsparagusEduardo Dec 27, 2025
8df52e8
BoxPokemon_GetDataBlock
AsparagusEduardo Dec 27, 2025
7893c31
Pokemon_Size
AsparagusEduardo Dec 27, 2025
b9643d2
IVs
AsparagusEduardo Dec 28, 2025
e598b0e
BoxPokemon_RestorePP
AsparagusEduardo Dec 28, 2025
f6ee64f
Species_GetFormNarcIndex
AsparagusEduardo Dec 28, 2025
f723555
(Box)Pokemon_(Unl/L)ockEncryption -> (Box)Pokemon_(De/En)cryptData
AsparagusEduardo Dec 30, 2025
0f9e6eb
BattleFacility -> BattleTower
AsparagusEduardo Dec 31, 2025
64f6beb
Base form renames
AsparagusEduardo Jan 2, 2026
e995ed0
Updated friendship event constants
AsparagusEduardo Jan 2, 2026
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
76 changes: 38 additions & 38 deletions arm9/asm/scrcmd_12.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,17 +349,17 @@ sub_02042F6C: ; 0x02042F6C
mov r1, #0x97
add r2, r7, #0x0
add r5, #0xf0
bl GetMonData
bl Pokemon_GetData
add r1, r7, #0x0
str r0, [sp, #0x8]
add r0, r4, #0x0
add r2, r1, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x14]
add r0, r4, #0x0
mov r1, #0x7
add r2, r7, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
bl OS_GetTick
bl PRandom
Expand All @@ -371,7 +371,7 @@ sub_02042F6C: ; 0x02042F6C
cmp r0, #0x1
bne _02042FE6
add r0, r6, #0x0
bl CalcShininessByOtIdAndPersonality
bl Personality_IsShiny
cmp r0, #0x0
beq _02042FE8
_02042FD0:
Expand All @@ -380,7 +380,7 @@ _02042FD0:
add r1, r0, #0x0
add r0, r6, #0x0
str r1, [sp, #0x34]
bl CalcShininessByOtIdAndPersonality
bl Personality_IsShiny
cmp r0, #0x0
bne _02042FD0
b _02042FE8
Expand All @@ -389,43 +389,43 @@ _02042FE6:
_02042FE8:
ldr r1, [sp, #0x34]
add r0, r4, #0x0
bl sub_0206A23C
bl Pokemon_SetPersonality
add r0, r4, #0x0
bl GetMonGender
bl Pokemon_GetGender
str r0, [sp, #0x30]
add r0, r4, #0x0
mov r1, #0x6f
add r2, sp, #0x30
bl SetMonData
bl Pokemon_SetData
add r0, r4, #0x0
mov r1, #0x4b
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x18]
add r0, r4, #0x0
mov r1, #0x4a
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x1c]
add r0, r4, #0x0
mov r1, #0x49
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x20]
add r0, r4, #0x0
mov r1, #0x48
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
str r0, [sp, #0x24]
add r0, r4, #0x0
mov r1, #0x46
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r6, r0, #0x0
add r0, r4, #0x0
mov r1, #0x47
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
add r1, r6, r0
ldr r0, [sp, #0x24]
add r1, r0, r1
Expand All @@ -445,7 +445,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x46
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
Expand All @@ -454,7 +454,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x47
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
Expand All @@ -463,7 +463,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x48
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
bl LCRandom
add r6, r0, #0x0
mov r0, #0x1f
Expand All @@ -472,7 +472,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x49
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x3e
lsl r0, r0, #0x4
and r0, r6
Expand All @@ -481,7 +481,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4a
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
mov r0, #0x1f
lsl r0, r0, #0xa
and r0, r6
Expand All @@ -490,7 +490,7 @@ _02042FE8:
add r0, r4, #0x0
mov r1, #0x4b
add r2, sp, #0x34
bl SetMonData
bl Pokemon_SetData
_020430DA:
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
Expand All @@ -499,7 +499,7 @@ _020430DA:
add r0, r4, #0x0
mov r1, #0x2e
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020430FC
mov r0, #0x49
Expand All @@ -510,7 +510,7 @@ _020430FC:
add r0, r4, #0x0
mov r1, #0x2f
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043114
mov r0, #0x4a
Expand All @@ -521,7 +521,7 @@ _02043114:
add r0, r4, #0x0
mov r1, #0x30
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204312C
mov r0, #0x4b
Expand All @@ -532,7 +532,7 @@ _0204312C:
add r0, r4, #0x0
mov r1, #0x31
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043144
mov r0, #0x4c
Expand All @@ -543,7 +543,7 @@ _02043144:
add r0, r4, #0x0
mov r1, #0x32
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204315C
mov r0, #0x4d
Expand All @@ -554,7 +554,7 @@ _0204315C:
add r0, r4, #0x0
mov r1, #0x33
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _02043174
mov r0, #0x4e
Expand All @@ -565,7 +565,7 @@ _02043174:
add r0, r4, #0x0
mov r1, #0x34
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _0204318C
mov r0, #0x4f
Expand All @@ -576,7 +576,7 @@ _0204318C:
add r0, r4, #0x0
mov r1, #0x67
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431A4
mov r0, #0x19
Expand All @@ -587,7 +587,7 @@ _020431A4:
add r0, r4, #0x0
mov r1, #0x68
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431BC
mov r0, #0x1a
Expand All @@ -598,7 +598,7 @@ _020431BC:
add r0, r4, #0x0
mov r1, #0x69
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
beq _020431D4
mov r0, #0x1b
Expand All @@ -621,23 +621,23 @@ _020431D4:
bl PlayerProfile_GetTrainerGender
str r0, [sp, #0x28]
mov r0, #0x20
bl AllocMonZeroed
bl Pokemon_New
add r7, r0, #0x0
add r0, r4, #0x0
add r1, r7, #0x0
bl CopyPokemonToPokemon
bl Pokemon_Copy
add r0, r7, #0x0
mov r1, #0x90
add r2, r5, #0x0
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0x0
mov r1, #0x7
add r2, sp, #0x2c
bl SetMonData
bl Pokemon_SetData
add r0, r7, #0x0
mov r1, #0x9c
add r2, sp, #0x28
bl SetMonData
bl Pokemon_SetData
add r0, r5, #0x0
add r4, r7, #0x0
bl String_Delete
Expand All @@ -653,7 +653,7 @@ _0204322C:
mov r2, #0x4
bl sub_0208089C
add r0, r4, #0x0
bl CalcMonLevelAndStats
bl Pokemon_CalcLevelAndStats
ldr r0, [sp, #0x4]
ldr r0, [r0, #0xc]
bl SaveArray_Party_Get
Expand Down Expand Up @@ -696,7 +696,7 @@ sub_02043274: ; 0x02043274
mov r1, #0x0
bl BufferPlayersName
add r0, r7, #0x4
bl sub_020690E4
bl Pokemon_GetBoxMon
add r2, r0, #0x0
ldr r0, [r5, #0x4]
mov r1, #0x1
Expand Down Expand Up @@ -742,7 +742,7 @@ sub_020432C8: ; 0x020432C8
mov r1, #0x0
bl BufferPlayersName
add r0, r7, #0x4
bl sub_020690E4
bl Pokemon_GetBoxMon
add r2, r0, #0x0
ldr r0, [r5, #0x4]
mov r1, #0x1
Expand Down
10 changes: 5 additions & 5 deletions arm9/asm/scrcmd_5.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,13 @@ _0204123C:
mov r1, #0x4c
mov r2, #0x0
add r4, r0, #0x0
bl GetMonData
bl Pokemon_GetData
cmp r0, #0x0
bne _0204127C
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetMonData
bl Pokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
Expand Down Expand Up @@ -132,19 +132,19 @@ _02041290:
mov r1, #0x5
mov r2, #0x0
add r4, r0, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
beq _020412E0
add r0, r4, #0x0
mov r1, #0x4c
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
cmp r0, #0x0
bne _020412E0
add r0, r4, #0x0
mov r1, #0x7
mov r2, #0x0
bl GetBoxMonData
bl BoxPokemon_GetData
lsl r0, r0, #0x10
lsr r1, r0, #0x10
lsl r1, r1, #0x10
Expand Down
2 changes: 1 addition & 1 deletion arm9/asm/scrcmd_9.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ sub_02042288: ; 0x02042288
add r4, r1, #0x0
bl SaveArray_Party_Get
bl GetFirstNonEggInParty
bl sub_020690E4
bl Pokemon_GetBoxMon
add r2, r0, #0x0
add r0, r4, #0x0
mov r1, #0x0
Expand Down
Loading