diff options
Diffstat (limited to 'engine/specials.asm')
| -rwxr-xr-x | engine/specials.asm | 242 |
1 files changed, 117 insertions, 125 deletions
diff --git a/engine/specials.asm b/engine/specials.asm index c4cf737e..09f9dfdb 100755 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -13,127 +13,118 @@ Special:: ; c22b ret SpecialsPointers: -special_pointer: MACRO -IF DEF(GOLD) - dbw \1, \2 -ENDC -IF DEF(SILVER) - dbw \1, \3 -ENDC -ENDM - - dbw $25, $7a59 - dbw $0a, $5b22 - dbw $0a, $5b4b - dbw $0a, $5bcc - dbw $0a, $5c71 - dbw $0a, $5c8d - dbw $0a, $5d01 - dbw $0a, $5cf9 - dbw $0a, $5ad9 - dbw $0a, $5b2b - dbw $0a, $5b34 - dbw $0a, $5a47 - dbw $0a, $5ac7 - dbw $0a, $5ccf - dbw $0a, $5ce4 - dbw $0a, $5cba - dbw $0a, $5d4e - dba Special_CheckMysteryGift - dba Special_GetMysteryGiftItem - dbw $0a, $64e7 - dba BugContestJudging - dbw $31, $7bbf - dbw $04, $7dce - dbw $04, $7ded - dbw $04, $799d - dbw $3e, $7c3c - dbw $3e, $7dd6 - dba HealParty - dbw $05, $5871 - dba Special_PlayerPC - dbw $05, $6935 - dbw $05, $6989 - dbw $05, $6b8c - dbw $0b, $4352 - dbw $05, $646d - dbw $23, $4e7c - dbw $03, $43f7 - dbw $24, $48dc - dba Special_TownMap - dba Special_UnownPrinter - dba MapRadio - dba Special_UnownPuzzle - dba Special_SlotMachine - dba Special_CardFlip - dba Special_DummyNonfunctionalGameCornerGame - dba Special_ClearBGPalettesBufferScreen - dbw $23, $43ab - dbw $23, $43c4 - dbw $23, $43a0 - dbw $23, $43b9 - dbw $02, Functiond42 - dba ClearBGPalettes ; dbw $00, $3449 - dba UpdateTimePals ; dbw $00, $0359 - dba ClearTileMap ; dbw $00, $0ecf - dba UpdateSprites ; dbw $00, $196f - dba Functiond97 ; dbw $00, $0d97 - dbw $03, $438a - dbw $03, $43ac - dbw $03, WaitSFX ; $3e56 - dba PlayMapMusic ; dbw $00, $3ebd - dba RestartMapMusic ; dbw $00, $3f25 - dbw $04, $66fd - dbw $02, $4969 - dbw $03, $43b4 - dbw $03, $43c2 - dbw $03, $43d0 - dbw $03, $43de - dba Special_CheckUnusedTwoDayTimer - dbw $05, $77a5 - dbw $05, $77c4 - dbw $04, $7d64 - dba Functionc556 - dbw $09, $71be - dbw $09, $7216 - dba Function73e1 ; special_pointer $01, $73e1, $73a7 - dba Function7452 ; special_pointer $01, $7452, $7418 - dba Function74cb ; special_pointer $01, $74cb, $7491 - dba Functionc588 - dbw $09, $4a4d - dbw $09, $4a76 - dbw $09, $4a10 - dbw $31, $7a5a - dba Functionc5a3 - dba Functionc591 - dbw $31, $7bad - dba Functionc5bb - dba SpecialNameRater - dba Special_DisplayLinkRecord - dba GetFirstPokemonHappiness ; special_pointer $01, $726c, $7232 - dba CheckFirstMonIsEgg ; special_pointer $01, $728b, $7251 - dbw $0a, $69f7 - dbw $0a, $6a6b - dbw $0a, $6ab3 - dbw $05, $4226 - dbw $3e, $794b - dba Functionc5d6 - dba Function74e7 ; special_pointer $01, $74e7, $74ad - dba Function74ec ; special_pointer $01, $74ec, $74b2 - dba Function74f1 ; special_pointer $01, $74f1, $74b7 - dba Functionc60b - dbw $09, $67ca - dba Functionc611 - dba Functionc652 - dbw $05, $6ff7 - dbw $0a, $67d7 - dba Functionc628 - dba Functionc638 - dba Functionc645 - dbw $24, $4a1b - dbw $24, $4a54 - dbw $24, $4a8d - dba SpecialNone ; $03, $4389 + add_special Function97a59 + add_special Function29b22 + add_special Function29b4b + add_special Function29bcc + add_special Function29c71 + add_special Function29c8d + add_special Function29d01 + add_special Function29cf9 + add_special Function29ad9 + add_special Function29b2b + add_special Function29b34 + add_special Function29a47 + add_special Function29ac7 + add_special Function29ccf + add_special Function29ce4 + add_special Function29cba + add_special Function29d4e + add_special Special_CheckMysteryGift + add_special Special_GetMysteryGiftItem + add_special Function2a4e7 + add_special BugContestJudging + add_special Functionc7bbf + add_special Function13dce + add_special Function13ded + add_special Function1399d + add_special Functionfbc3c + add_special Functionfbdd6 + add_special HealParty + add_special Function15871 + add_special Special_PlayerPC + add_special Function16935 + add_special Function16989 + add_special Function16b8c + add_special Function2c352 + add_special Function1646d + add_special Function8ce7c + add_special Special_NameRival + add_special Function908dc + add_special Special_TownMap + add_special Special_UnownPrinter + add_special MapRadio + add_special Special_UnownPuzzle + add_special Special_SlotMachine + add_special Special_CardFlip + add_special Special_DummyNonfunctionalGameCornerGame + add_special Special_ClearBGPalettesBufferScreen + add_special Function8c3ab + add_special Function8c3c4 + add_special FadeInPalettes + add_special Function8c3b9 + add_special Functiond42, $02 + add_special ClearBGPalettes + add_special UpdateTimePals + add_special ClearTileMap + add_special UpdateSprites + add_special Functiond97 + add_special Special_GameCornerPrizeMonCheckDex + add_special SpecialSeenMon + add_special WaitSFX, $03 + add_special PlayMapMusic + add_special RestartMapMusic + add_special Function126fd + add_special Function8969 + add_special Special_FindGreaterThanThatLevel + add_special Special_FindAtLeastThatHappy + add_special Special_FindThatSpecies + add_special Special_FindThatSpeciesYourTrainerID + add_special Special_CheckUnusedTwoDayTimer + add_special Function177a5 + add_special Function177c4 + add_special Function13d64 + add_special Functionc556 + add_special Function271be + add_special Function27216 + add_special Function73e1 + add_special Function7452 + add_special Function74cb + add_special Functionc588 + add_special Function24a4d + add_special Function24a76 + add_special Function24a10 + add_special Functionc7a5a + add_special Functionc5a3 + add_special Functionc591 + add_special Functionc7bad + add_special Functionc5bb + add_special SpecialNameRater + add_special Special_DisplayLinkRecord + add_special GetFirstPokemonHappiness + add_special CheckFirstMonIsEgg + add_special Function2a9f7 + add_special Function2aa6b + add_special Function2aab3 + add_special Function14226 + add_special Functionfb94b + add_special Functionc5d6 + add_special Function74e7 + add_special Function74ec + add_special Function74f1 + add_special Functionc60b + add_special Function267ca + add_special Functionc611 + add_special Functionc652 + add_special Function16ff7 + add_special Function2a7d7 + add_special Functionc628 + add_special Functionc638 + add_special Functionc645 + add_special Function90a1b + add_special Function90a54 + add_special Function90a8d + add_special SpecialNone SpecialNone: ; c389 ret @@ -149,7 +140,7 @@ Special_GameCornerPrizeMonCheckDex: ; c38a call FadeToMenu ld a, [wScriptVar] ld [wd151], a - callba Functionfb981 + callba ConvertMon_1to2 call ExitAllMenus ret @@ -478,9 +469,9 @@ Functionc5d6: ; c5d6 (3:45d6) ld a, [wChannelsEnd] cp $40 jr nz, .asm_c5fb - ld a, [wda03] + ld a, [wXCoord] ld b, a - ld a, [wda02] + ld a, [wYCoord] ld c, a ld hl, .ProximityCoords .asm_c5e8 @@ -566,8 +557,9 @@ Functionc652: ; c652 (3:4652) ld [wScriptVar], a jp CloseSRAM -FlagPredef: +Functionc660: nop +FlagPredef: push hl push bc push bc |