diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-25 23:34:33 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-12-25 23:34:33 -0500 |
| commit | 7683b78fb41cbcd89608b88796b902fd140a2749 (patch) | |
| tree | 9699874eb70c2fdcd8b2b20a9262917b9fb1440f /engine | |
| parent | a5e928eb984d8995d17e42d415f687f5affb2935 (diff) | |
Labels relating to odd egg
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/engine_flags.asm | 4 | ||||
| -rw-r--r-- | engine/specials.asm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index 74113b4a5..fe06f35c3 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -99,8 +99,8 @@ ENDM engine_flag wPokegearFlags, 7 ; on/off ; wDaycareMan, 7 ; daycare 1 on - engine_flag wDaycareMan, 6 ; monster 1 and 2 are compatible - ; wDaycareMan, 5 ; egg is ready + engine_flag wDaycareMan, 6 ; egg is ready + ; wDaycareMan, 5 ; monster 1 and 2 are compatible engine_flag wDaycareMan, 0 ; monster 1 in daycare ; wDaycareLady, 7 = daycare 2 on diff --git a/engine/specials.asm b/engine/specials.asm index 3db37eacc..79c413fb5 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -147,7 +147,7 @@ SpecialsPointers:: ; c029 add_special Function_LoadOpponentTrainerAndPokemonsWithOTSprite add_special Function11ba38 add_special SpecialCheckForBattleTowerRules - add_special Function117656 + add_special Special_GiveOddEgg add_special Reset add_special Function1011f1 add_special Function101220 |