This commit is contained in:
PikalaxALT
2019-05-05 14:56:59 -04:00
parent 7f07bd6607
commit a37da53f20
24 changed files with 2770 additions and 3338 deletions
+6 -20
View File
@@ -555,23 +555,9 @@ gUnknown_825E2F4:: @ 825E2F4
.section .rodata.825EF0C
gUnknown_825EF0C:: @ 825EF0C
.incbin "baserom.gba", 0x25EF0C, 0x8E8
gUnknown_825F7F4:: @ 825F7F4
.incbin "baserom.gba", 0x25F7F4, 0x20
gUnknown_825F814:: @ 825F814
.incbin "baserom.gba", 0x25F814, 0x18
gUnknown_825F82C:: @ 825F82C
.incbin "baserom.gba", 0x25F82C, 0x10
gUnknown_825F83C:: @ 825F83C
.incbin "baserom.gba", 0x25F83C, 0x2
gUnknown_825F83E:: @ 825F83E
.incbin "baserom.gba", 0x25F83E, 0x8DE
.align 2
gUnknown_825F844:: @ 825F842
.incbin "baserom.gba", 0x25f844, 0x8d8
gUnknown_826011C:: @ 826011C
.incbin "baserom.gba", 0x26011C, 0x8
@@ -741,13 +727,13 @@ gUnknown_8261E8A:: @ 8261E8A
gUnknown_8261EB6:: @ 8261EB6
.incbin "baserom.gba", 0x261EB6, 0xB
gUnknown_8261EC1:: @ 8261EC1
gText_MaleSymbol4:: @ 8261EC1
.incbin "baserom.gba", 0x261EC1, 0x2
gUnknown_8261EC3:: @ 8261EC3
gText_FemaleSymbol4:: @ 8261EC3
.incbin "baserom.gba", 0x261EC3, 0x2
gUnknown_8261EC5:: @ 8261EC5
gText_GenderlessSymbol:: @ 8261EC5
.incbin "baserom.gba", 0x261EC5, 0x2
gUnknown_8261EC7:: @ 8261EC7
+14 -2
View File
@@ -817,7 +817,7 @@ gUnknown_841621F:: @ 841621F
gUnknown_8416221:: @ 8416221
.string "$"
gUnknown_8416223:: @ 8416223
gText_Lv:: @ 8416223
.string "{UNKNOWN_F9 0x05}$"
gOtherText_UnkF9_08_Clear_01:: @ 8416226
@@ -2375,7 +2375,19 @@ gUnknown_841E234:: @ 841E234
.incbin "baserom.gba", 0x41E234, 0xF1
gUnknown_841E325:: @ 841E325
.incbin "baserom.gba", 0x41E325, 0xBE
.string "Communication standby$"
gDaycareText_GetAlongVeryWell:: @ 841E33C
.string "The two seem to get along\nvery well.$"
gDaycareText_GetAlong:: @ 841E361
.string "The two seem to get along.$"
gDaycareText_DontLikeOther:: @ 841E37C
.string "The two dont seem to like\neach other much.$"
gDaycareText_PlayOther:: @ 841E3A8
.string "The two prefer to play with other\nPOKéMON than each other.$"
gUnknown_841E3E3:: @ 841E3E3
.incbin "baserom.gba", 0x41E3E3, 0x18
+6 -6
View File
@@ -191,7 +191,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special sub_80CA74C
def_special GetDaycareMonNicknames
def_special sub_80464B4
def_special GetDaycareState
def_special RejectEggFromDayCare
def_special GiveEggFromDaycare
def_special SetDaycareCompatibilityString
@@ -383,11 +383,11 @@ gSpecials:: @ 815FD60
def_special SetFlavorTextFlagFromSpecialVars
def_special UpdatePickStateFromSpecialVar8005
def_special sub_8054C48
def_special sub_8046B40
def_special sub_8046B70
def_special sub_8046B94
def_special sub_8046BBC
def_special sub_8046BDC
def_special PutMonInRoute5Daycare
def_special GetCostToWithdrawRoute5DaycareMon
def_special IsThereMonInRoute5Daycare
def_special GetNumLevelsGainedForRoute5DaycareMon
def_special TakePokemonFromRoute5Daycare
def_special ScrSpecial_SeaGallopFerry
def_special sub_80CC48C
def_special sub_812B220