diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-06 10:49:10 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-06 10:49:10 -0400 |
| commit | e9e87a0fe47406b5d2881b9360886842b8731c97 (patch) | |
| tree | 4007bb25d799df054f5cd7bd5cb80b49f0667722 /data | |
| parent | 5f49353de4df86401ec0c7844f08ec1db9587484 (diff) | |
egg_hatch as part of daycare
Diffstat (limited to 'data')
| -rw-r--r-- | data/data.s | 32 | ||||
| -rw-r--r-- | data/data_83FECCC.s | 4 | ||||
| -rw-r--r-- | data/graphics.s | 8 | ||||
| -rw-r--r-- | data/specials.inc | 2 |
4 files changed, 8 insertions, 38 deletions
diff --git a/data/data.s b/data/data.s index f8b4a86ca..5c2309e7a 100644 --- a/data/data.s +++ b/data/data.s @@ -550,36 +550,6 @@ gUnknown_825E05C:: @ 825E05C .section .rodata.825EF0C .align 2 -gUnknown_825F844:: @ 825F842 - .incbin "baserom.gba", 0x25f844, 0x8d8 - -gUnknown_826011C:: @ 826011C - .incbin "baserom.gba", 0x26011C, 0x8 - -gUnknown_8260124:: @ 8260124 - .incbin "baserom.gba", 0x260124, 0x8 - -gUnknown_826012C:: @ 826012C - .incbin "baserom.gba", 0x26012C, 0x8 - -gUnknown_8260134:: @ 8260134 - .incbin "baserom.gba", 0x260134, 0x50 - -gUnknown_8260184:: @ 8260184 - .incbin "baserom.gba", 0x260184, 0x18 - -gUnknown_826019C:: @ 826019C - .incbin "baserom.gba", 0x26019C, 0x8 - -gUnknown_82601A4:: @ 82601A4 - .incbin "baserom.gba", 0x2601A4, 0x10 - -gUnknown_82601B4:: @ 82601B4 - .incbin "baserom.gba", 0x2601B4, 0x8 - -gUnknown_82601BC:: @ 82601BC - .incbin "baserom.gba", 0x2601BC, 0x4C - gUnknown_8260208:: @ 8260208 .incbin "baserom.gba", 0x260208, 0x8 @@ -763,7 +733,7 @@ gUnknown_8262055:: @ 8262055 gUnknown_826407C:: @ 826407C .incbin "baserom.gba", 0x26407C, 0x1FA0 -gUnknown_826601C:: @ 826601C +gUnknown_08331F60:: @ 826601C .incbin "baserom.gba", 0x26601C, 0x1000 gUnknown_826701C:: @ 826701C diff --git a/data/data_83FECCC.s b/data/data_83FECCC.s index f911f30ec..bcf6b8516 100644 --- a/data/data_83FECCC.s +++ b/data/data_83FECCC.s @@ -1888,10 +1888,10 @@ gUnknown_841B6EC:: @ 841B6EC gUnknown_841B6F3:: @ 841B6F3 .incbin "baserom.gba", 0x41B6F3, 0xA -gUnknown_841B6FD:: @ 841B6FD +gText_HatchedFromEgg:: @ 841B6FD .incbin "baserom.gba", 0x41B6FD, 0x19 -gUnknown_841B716:: @ 841B716 +gText_NickHatchPrompt:: @ 841B716 .incbin "baserom.gba", 0x41B716, 0x31 gUnknown_841B747:: @ 841B747 diff --git a/data/graphics.s b/data/graphics.s index 12cb6a33f..4923d4441 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -1,9 +1,9 @@ .section gfx_data, "aw", %progbits -gUnknown_8D00000:: @ 8D00000 +gBattleTextboxTiles:: @ 8D00000 .incbin "baserom.gba", 0xD00000, 0x4D8 -gUnknown_8D004D8:: @ 8D004D8 +gBattleTextboxPalette:: @ 8D004D8 .incbin "baserom.gba", 0xD004D8, 0x44 .align 2 @@ -16359,10 +16359,10 @@ gUnknown_8EAE900:: @ 8EAE900 gUnknown_8EAEA00:: @ 8EAEA00 .incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN -gUnknown_8EAEA20:: @ 8EAEA20 +gTradeGba2_Pal:: @ 8EAEA20 .incbin "baserom.gba", 0xEAEA20, 0x60 @UNKNOWN -gUnknown_8EAEA80:: @ 8EAEA80 +gTradeGba_Gfx:: @ 8EAEA80 .incbin "baserom.gba", 0xEAEA80, 0x1420 @UNKNOWN gUnknown_8EAFEA0:: @ 8EAFEA0 diff --git a/data/specials.inc b/data/specials.inc index dba67f852..501ca0457 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -203,7 +203,7 @@ gSpecials:: @ 815FD60 def_special GetDaycareCost def_special TakePokemonFromDaycare def_special ScriptHatchMon - def_special sub_8046FD4 + def_special EggHatch def_special sub_8046EAC def_special sub_80CD228 def_special IsEnoughForCostInVar0x8005 |