diff options
Diffstat (limited to 'asm/egg_hatch.s')
| -rw-r--r-- | asm/egg_hatch.s | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/asm/egg_hatch.s b/asm/egg_hatch.s index ae27d6e31..b8dae1bba 100644 --- a/asm/egg_hatch.s +++ b/asm/egg_hatch.s @@ -1,6 +1,6 @@ - .include "constants/gba_constants.s" - .include "constants/species_constants.s" - .include "asm/macros.s" + .include "constants/gba_constants.inc" + .include "constants/species_constants.inc" + .include "asm/macros.inc" .syntax unified @@ -245,13 +245,13 @@ _08042AA4: .4byte gStringVar1 thumb_func_start ScriptHatchMon ScriptHatchMon: @ 8042AA8 push {lr} - ldr r0, _08042AB8 @ =gUnknown_0202E8CC + ldr r0, _08042AB8 @ =gSpecialVar_0x8004 ldrb r0, [r0] bl AddHatchedMonToParty pop {r0} bx r0 .align 2, 0 -_08042AB8: .4byte gUnknown_0202E8CC +_08042AB8: .4byte gSpecialVar_0x8004 thumb_func_end ScriptHatchMon thumb_func_start sub_8042ABC @@ -325,7 +325,7 @@ _08042B42: sub_8042B4C: @ 8042B4C push {lr} ldr r0, _08042B60 @ =gSaveBlock1 + 0x2F9C - ldr r1, _08042B64 @ =gUnknown_0202E8CC + ldr r1, _08042B64 @ =gSpecialVar_0x8004 ldrb r1, [r1] bl sub_8042ABC lsls r0, 24 @@ -334,7 +334,7 @@ sub_8042B4C: @ 8042B4C bx r1 .align 2, 0 _08042B60: .4byte gSaveBlock1 + 0x2F9C -_08042B64: .4byte gUnknown_0202E8CC +_08042B64: .4byte gSpecialVar_0x8004 thumb_func_end sub_8042B4C thumb_func_start EggHatchCreateMonSprite @@ -477,7 +477,7 @@ EggHatch: @ 8042C80 push {lr} sub sp, 0x4 bl ScriptContext2_Enable - ldr r0, _08042CA8 @ =sub_8042CAC + ldr r0, _08042CA8 @ =Task_EggHatch movs r1, 0xA bl CreateTask movs r0, 0x1 @@ -505,7 +505,7 @@ Task_EggHatch: @ 8042CAC ands r0, r1 cmp r0, 0 bne _08042CD0 - ldr r0, _08042CDC @ =sub_8042CE8 + ldr r0, _08042CDC @ =CB2_EggHatch_0 bl SetMainCallback2 ldr r1, _08042CE0 @ =gUnknown_0300485C ldr r0, _08042CE4 @ =sub_8080990 @@ -562,7 +562,7 @@ _08042D34: ldr r1, _08042D74 @ =gUnknown_0300481C ldr r0, _08042D78 @ =0x02018000 str r0, [r1] - ldr r1, _08042D7C @ =gUnknown_0202E8CC + ldr r1, _08042D7C @ =gSpecialVar_0x8004 ldrh r1, [r1] strb r1, [r0, 0x4] adds r0, 0x3A @@ -570,7 +570,7 @@ _08042D34: bl ResetTasks bl ResetSpriteData bl FreeAllSpritePalettes - ldr r0, _08042D80 @ =sub_8042C6C + ldr r0, _08042D80 @ =VBlankCB_EggHatch bl SetVBlankCallback ldr r1, _08042D84 @ =gMain ldr r2, _08042D88 @ =0x0000043c @@ -579,17 +579,17 @@ _08042D34: adds r0, 0x1 strb r0, [r1] bl GetCurrentMapMusic - ldr r1, _08042D8C @ =gUnknown_0202E8CE + ldr r1, _08042D8C @ =gSpecialVar_0x8005 strh r0, [r1] b _08042F6E .align 2, 0 _08042D74: .4byte gUnknown_0300481C _08042D78: .4byte 0x02018000 -_08042D7C: .4byte gUnknown_0202E8CC +_08042D7C: .4byte gSpecialVar_0x8004 _08042D80: .4byte VBlankCB_EggHatch _08042D84: .4byte gMain _08042D88: .4byte 0x0000043c -_08042D8C: .4byte gUnknown_0202E8CE +_08042D8C: .4byte gSpecialVar_0x8005 _08042D90: ldr r5, _08042DBC @ =gWindowConfig_81E6F84 adds r0, r5, 0 @@ -789,7 +789,7 @@ _08042F40: strh r4, [r0] adds r0, 0x2 strh r4, [r0] - ldr r0, _08042F80 @ =sub_804300C + ldr r0, _08042F80 @ =CB2_EggHatch_1 bl SetMainCallback2 ldr r0, _08042F84 @ =gUnknown_0300481C ldr r0, [r0] @@ -809,7 +809,7 @@ _08042F84: .4byte gUnknown_0300481C thumb_func_start EggHatchSetMonNickname EggHatchSetMonNickname: @ 8042F88 push {lr} - ldr r0, _08042FA8 @ =gUnknown_0202E8CC + ldr r0, _08042FA8 @ =gSpecialVar_0x8004 ldrh r1, [r0] movs r0, 0x64 muls r0, r1 @@ -823,7 +823,7 @@ EggHatchSetMonNickname: @ 8042F88 pop {r0} bx r0 .align 2, 0 -_08042FA8: .4byte gUnknown_0202E8CC +_08042FA8: .4byte gSpecialVar_0x8004 _08042FAC: .4byte gPlayerParty _08042FB0: .4byte gStringVar3 _08042FB4: .4byte c2_exit_to_overworld_2_switch @@ -930,7 +930,7 @@ _08043068: ldrb r0, [r1, 0x2] adds r0, 0x1 strb r0, [r1, 0x2] - ldr r0, _0804309C @ =c3_080472E4 + ldr r0, _0804309C @ =Task_EggHatchPlayBGM movs r1, 0x5 bl CreateTask b _080432BA @@ -977,7 +977,7 @@ _080430D2: lsls r0, 2 adds r2, 0x1C adds r0, r2 - ldr r1, _080430F4 @ =sub_80432E4 + ldr r1, _080430F4 @ =SpriteCB_Egg_0 str r1, [r0] b _080432BA .align 2, 0 @@ -1148,7 +1148,7 @@ _080431DA: movs r2, 0 bl GetMonData str r0, [sp] - ldr r0, _08043284 @ =sub_8042F88 + ldr r0, _08043284 @ =EggHatchSetMonNickname str r0, [sp, 0x4] movs r0, 0x3 mov r1, r10 @@ -1217,7 +1217,7 @@ SpriteCB_Egg_0: @ 80432E4 asrs r0, 16 cmp r0, 0x14 ble _08043304 - ldr r0, _08043300 @ =sub_804333C + ldr r0, _08043300 @ =SpriteCB_Egg_1 str r0, [r4, 0x1C] movs r0, 0 strh r0, [r4, 0x2E] @@ -1270,7 +1270,7 @@ SpriteCB_Egg_1: @ 804333C asrs r0, 16 cmp r0, 0x14 ble _0804336C - ldr r0, _08043368 @ =sub_80433A0 + ldr r0, _08043368 @ =SpriteCB_Egg_2 str r0, [r4, 0x1C] strh r1, [r4, 0x2E] strh r1, [r4, 0x32] @@ -1322,7 +1322,7 @@ SpriteCB_Egg_2: @ 80433A0 asrs r0, 16 cmp r0, 0x26 ble _08043418 - ldr r0, _08043404 @ =sub_8043460 + ldr r0, _08043404 @ =SpriteCB_Egg_3 str r0, [r4, 0x1C] strh r6, [r4, 0x2E] ldr r5, _08043408 @ =gUnknown_0300481C @@ -1406,7 +1406,7 @@ SpriteCB_Egg_3: @ 8043460 asrs r0, 16 cmp r0, 0x32 ble _0804347A - ldr r0, _08043480 @ =sub_8043484 + ldr r0, _08043480 @ =SpriteCB_Egg_4 str r0, [r1, 0x1C] movs r0, 0 strh r0, [r1, 0x2E] @@ -1469,7 +1469,7 @@ _080434C0: movs r1, 0x4 orrs r0, r1 strb r0, [r2] - ldr r0, _08043500 @ =sub_8043504 + ldr r0, _08043500 @ =SpriteCB_Egg_5 str r0, [r5, 0x1C] strh r4, [r5, 0x2E] _080434EE: |