Skip to content

Commit

Permalink
Merge pull request #528 from red031000/master
Browse files Browse the repository at this point in the history
cleanup daycare.c
  • Loading branch information
red031000 authored Jul 14, 2023
2 parents 69b0762 + 2ab7cd6 commit b71dfbb
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 179 deletions.
36 changes: 18 additions & 18 deletions arm9/global.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1516,23 +1516,23 @@
.extern sub_02023BD4
.extern sub_02023BE8
.extern sub_02023C04
.extern Save_DayCare_sizeof
.extern Save_DayCare_Init
.extern Save_DayCare_GetMonX
.extern DayCareMon_GetBoxMon
.extern DayCareMon_GetExtras
.extern DayCareMon_GetSteps
.extern DayCareMail_GetCapsule
.extern Save_DayCare_GetEggPID
.extern Save_DayCare_GetEggCycleCounter
.extern DayCareMon_SetSteps
.extern DayCareMon_AddSteps
.extern Save_DayCare_SetEggPID
.extern Save_DayCare_SetEggCycleCounter
.extern Save_DayCare_MasudaCheck
.extern DayCareMon_Copy
.extern DayCareMon_Init
.extern Save_DayCare_Get
.extern Save_Daycare_sizeof
.extern Save_Daycare_Init
.extern Save_Daycare_GetMonX
.extern DaycareMon_GetBoxMon
.extern DaycareMon_GetExtras
.extern DaycareMon_GetSteps
.extern DayCareMail_GetMailPtr
.extern Save_Daycare_GetEggPID
.extern Save_Daycare_GetEggCycleCounter
.extern DaycareMon_SetSteps
.extern DaycareMon_AddSteps
.extern Save_Daycare_SetEggPID
.extern Save_Daycare_SetEggCycleCounter
.extern Save_Daycare_MasudaCheck
.extern DaycareMon_Copy
.extern DaycareMon_Init
.extern Save_Daycare_Get
.extern Save_Pokedex_sizeof
.extern Save_Pokedex_New
.extern Save_Pokedex_Copy
Expand Down Expand Up @@ -6771,7 +6771,7 @@
.extern ov05_021EC864
.extern ov05_021ECD64
.extern ov05_SetEggStats
.extern ov05_DayCare_GiveEggToPlayer
.extern ov05_Daycare_GiveEggToPlayer
.extern ov05_021ED378
.extern ov05_021ED49C
.extern ov05_021ED4E0
Expand Down
2 changes: 1 addition & 1 deletion arm9/overlays/05/asm/ov05_021D80E8.s
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,7 @@ ov05_021D8F38: ; 0x021D8F38
bl SaveArray_PlayerParty_Get
add r5, r0, #0
ldr r0, [r4, #0xc]
bl Save_DayCare_Get
bl Save_Daycare_Get
add r1, r5, #0
add r2, r4, #0
bl ov05_021ED378
Expand Down
Loading

0 comments on commit b71dfbb

Please sign in to comment.