diff options
Diffstat (limited to 'engine/specials.asm')
| -rw-r--r-- | engine/specials.asm | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index 5a10090ec..58cf5d646 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -83,11 +83,11 @@ SpecialsPointers:: ; c029 add_special PlayMapMusic add_special RestartMapMusic add_special HealMachineAnim - add_special Function8379 - add_special Functionc25a - add_special Functionc268 - add_special Functionc276 - add_special Functionc284 + add_special Special_SurfStartStep + add_special Special_FindGreaterThanThatLevel + add_special Special_FindAtLeastThatHappy + add_special Special_FindThatSpecies + add_special Special_FindThatSpeciesYourTrainerID add_special Functionc3ef add_special Function17421 add_special Function17440 @@ -163,7 +163,7 @@ SpecialsPointers:: ; c029 add_special Function103612 add_special SpecialHoOhChamber add_special Function102142 - add_special Function4989a + add_special Special_CelebiShrineEvent add_special Function49bf9 add_special SpecialPokeSeer add_special SpecialBuenasPassword @@ -186,8 +186,8 @@ SpecialsPointers:: ; c029 add_special Function4ae12 add_special LoadMapPalettes add_special Function4a927 - add_special Function90a54 - add_special Function90a88 + add_special Special_InitialSetDSTFlag + add_special Special_InitialClearDSTFlag add_special SpecialNone ; c224 @@ -225,40 +225,40 @@ SpecialSeenMon: ; c252 ret ; c25a -Functionc25a: ; c25a +Special_FindGreaterThanThatLevel: ; c25a ld a, [ScriptVar] ld b, a - callba Function4dbd2 - jr z, Functionc298 - jr Functionc292 + callba _FindGreaterThanThatLevel + jr z, FoundNone + jr FoundOne -Functionc268: ; c268 +Special_FindAtLeastThatHappy: ; c268 ld a, [ScriptVar] ld b, a - callba Function4dbd9 - jr z, Functionc298 - jr Functionc292 + callba _FindAtLeastThatHappy + jr z, FoundNone + jr FoundOne -Functionc276: ; c276 +Special_FindThatSpecies: ; c276 ld a, [ScriptVar] ld b, a - callba Function4dbe0 - jr z, Functionc298 - jr Functionc292 + callba _FindThatSpecies + jr z, FoundNone + jr FoundOne -Functionc284: ; c284 +Special_FindThatSpeciesYourTrainerID: ; c284 ld a, [ScriptVar] ld b, a - callba Function4dbe6 - jr z, Functionc298 - jr Functionc292 + callba _FindThatSpeciesYourTrainerID + jr z, FoundNone + jr FoundOne -Functionc292: ; c292 +FoundOne: ; c292 ld a, $1 ld [ScriptVar], a ret -Functionc298: ; c298 +FoundNone: ; c298 xor a ld [ScriptVar], a ret @@ -314,9 +314,9 @@ Special_KrissHousePC: ; c2e7 ; c2f6 Special_CheckMysteryGift: ; c2f6 - ld a, BANK(s0_abe2) + ld a, BANK(sMysteryGiftItem) call GetSRAMBank - ld a, [s0_abe2] + ld a, [sMysteryGiftItem] and a jr z, .no inc a @@ -328,9 +328,9 @@ Special_CheckMysteryGift: ; c2f6 ; c309 Special_GetMysteryGiftItem: ; c309 - ld a, BANK(s0_abe2) + ld a, BANK(sMysteryGiftItem) call GetSRAMBank - ld a, [s0_abe2] + ld a, [sMysteryGiftItem] ld [CurItem], a ld a, $1 ld [wd10c], a @@ -338,12 +338,12 @@ Special_GetMysteryGiftItem: ; c309 call ReceiveItem jr nc, .asm_c33d xor a - ld [s0_abe2], a + ld [sMysteryGiftItem], a call CloseSRAM ld a, [CurItem] ld [wd265], a call GetItemName - ld hl, UnknownText_0xc345 + ld hl, .ReceiveItemText call PrintText ld a, $1 ld [ScriptVar], a @@ -356,7 +356,7 @@ Special_GetMysteryGiftItem: ; c309 ret ; c345 -UnknownText_0xc345: ; 0xc345 +.ReceiveItemText: ; 0xc345 ; received item text_jump UnknownText_0x1bd3be db "@" @@ -639,8 +639,8 @@ Functionc4ac: ; c4ac ; c4b9 SpecialTrainerHouse: ; 0xc4b9 - ld a, BANK(s0_abfd) + ld a, BANK(sMysteryGiftTrainerHouseFlag) call GetSRAMBank - ld a, [s0_abfd] + ld a, [sMysteryGiftTrainerHouseFlag] ld [ScriptVar], a jp CloseSRAM |