diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-20 08:32:12 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-20 08:32:12 -0400 |
| commit | 25cec8486a08716b840d4dc20fb5c7099c1ef568 (patch) | |
| tree | 5fa097cb91d33d7f91587f774f4f380b719bd595 | |
| parent | dcaccec48176b0bb90e981ad106b7a6386fbd557 (diff) | |
Resolve predef pointers
| -rw-r--r-- | constants.asm | 1 | ||||
| -rwxr-xr-x | constants/predef_constants.asm | 77 | ||||
| -rwxr-xr-x | engine/map_objects.asm | 12 | ||||
| -rwxr-xr-x | engine/npc_movement.asm | 4 | ||||
| -rwxr-xr-x | engine/predef.asm | 138 | ||||
| -rwxr-xr-x | engine/specials.asm | 242 | ||||
| -rwxr-xr-x | engine/variables.asm | 24 | ||||
| -rw-r--r-- | home/map.asm | 28 | ||||
| -rw-r--r-- | main.asm | 406 | ||||
| -rw-r--r-- | wram.asm | 8 |
10 files changed, 585 insertions, 355 deletions
diff --git a/constants.asm b/constants.asm index 451236e5..a9004b73 100644 --- a/constants.asm +++ b/constants.asm @@ -34,4 +34,3 @@ INCLUDE "constants/battle_tower_constants.asm" INCLUDE "constants/cry_constants.asm" INCLUDE "constants/audio_constants.asm" INCLUDE "constants/printer_constants.asm" -INCLUDE "constants/predef_constants.asm" diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm deleted file mode 100755 index 8a3b2cf3..00000000 --- a/constants/predef_constants.asm +++ /dev/null @@ -1,77 +0,0 @@ - enum_start 0, 3 - enum_set $4b5b - - predef_const LearnMove ; $0 - predef_const Predef1 - predef_const HealParty - predef_const FlagPredef - predef_const ComputeHPBarPixels - predef_const FillPP - predef_const TryAddMonToParty - predef_const AddTempmonToParty - predef_const SentGetPkmnIntoFromBox ; $8 - predef_const SentPkmnIntoBox - predef_const GiveEgg - predef_const AnimateHPBar - predef_const CalcPkmnStats - predef_const CalcPkmnStatC - predef_const CanLearnTMHMMove - predef_const GetTMHMMove - predef_const Predef_LinkTextbox ; $10 - predef_const PrintMoveDesc - predef_const UpdatePlayerHUD - predef_const PlaceGraphic - predef_const CheckPlayerPartyForFitPkmn - predef_const UpdateEnemyHUD - predef_const StartBattle - predef_const FillInExpBar - predef_const GetMonBackpic ; $18 - predef_const GetMonFrontpic - predef_const LearnLevelMoves - predef_const FillMoves - predef_const EvolveAfterBattle - predef_const TradeAnimationPlayer2 - predef_const TradeAnimation - predef_const CopyPkmnToTempMon - predef_const ListMoves ; $20 - predef_const PlaceNonFaintStatus - predef_const Predef22 - predef_const ListMovePP - predef_const GetGender - predef_const StatsScreenInit - predef_const DrawPlayerHP - predef_const DrawEnemyHP - predef_const PrintTempMonStats ; $28 - predef_const GetTypeName - predef_const PrintMoveType - predef_const PrintType - predef_const PrintMonTypes - predef_const GetUnownLetter - predef_const LoadPoisonBGPals - predef_const Predef2F - predef_const InitSGBBorder ; $30 - predef_const Predef_LoadSGBLayout - predef_const Area_ - predef_const CheckContestMon - predef_const Predef_StartBattle - predef_const Predef35 - predef_const Predef36 - predef_const PlayBattleAnim - predef_const Predef38 ; $38 - predef_const Predef39 - predef_const Predef3A - predef_const PartyMonItemName - predef_const GetFrontpic - predef_const GetBackpic - predef_const FrontpicPredef - predef_const GetTrainerPic - predef_const DecompressPredef ; $40 - predef_const CheckTypeMatchup - predef_const ConvertMon_1to2 - predef_const NewPokedexEntry - predef_const AnimateMon_Slow_Normal - predef_const PlaceStatusString - predef_const LoadMonAnimation - predef_const AnimateFrontpic - predef_const Predef48 ; $48 - predef_const HOF_AnimateFrontpic diff --git a/engine/map_objects.asm b/engine/map_objects.asm index 983b3daf..20d75238 100755 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -36,7 +36,7 @@ Function437c: ld hl, $5 add hl, bc res 6, [hl] - ld a, [wda03] + ld a, [wXCoord] ld e, a ld hl, $10 add hl, bc @@ -46,7 +46,7 @@ Function437c: jr c, .asm_43b3 cp $c jr nc, .asm_43b3 - ld a, [wda02] + ld a, [wYCoord] ld e, a ld hl, $11 add hl, bc @@ -62,7 +62,7 @@ Function437c: ld hl, $5 add hl, bc set 6, [hl] - ld a, [wda03] + ld a, [wXCoord] ld e, a ld hl, $14 add hl, bc @@ -72,7 +72,7 @@ Function437c: jr c, .asm_43df cp $c jr nc, .asm_43df - ld a, [wda02] + ld a, [wYCoord] ld e, a ld hl, $15 add hl, bc @@ -760,7 +760,7 @@ Function5636: ; 5636 (1:5636) ld e, [hl] inc d inc e - ld a, [wda03] + ld a, [wXCoord] cp d jr z, .asm_564f jr nc, .asm_565e @@ -768,7 +768,7 @@ Function5636: ; 5636 (1:5636) cp d jr c, .asm_565e .asm_564f - ld a, [wda02] + ld a, [wYCoord] cp e jr z, .asm_565c jr nc, .asm_565e diff --git a/engine/npc_movement.asm b/engine/npc_movement.asm index 78939e47..306066ae 100755 --- a/engine/npc_movement.asm +++ b/engine/npc_movement.asm @@ -412,7 +412,7 @@ HasPersonReachedMovementLimit: ; 7183 (1:7183) IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc) ld hl, $10 add hl, bc - ld a, [wda03] + ld a, [wXCoord] cp [hl] jr z, .asm_71dd jr nc, .asm_71f0 @@ -422,7 +422,7 @@ IsPersonMovingOffEdgeOfScreen: ; 71cc (1:71cc) .asm_71dd ld hl, $11 add hl, bc - ld a, [wda02] + ld a, [wYCoord] cp [hl] jr z, .asm_71ee jr nc, .asm_71f0 diff --git a/engine/predef.asm b/engine/predef.asm index 8e75fc4b..4068e313 100755 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -30,73 +30,73 @@ IF DEF(SILVER) ENDC endm - predef_pointer $65e7, $65ad, $01 ; add_predef LearnMove ; $0 - dwb $4031, $01 ; add_predef Predef1 ; $1 - predef_pointer $469d, $469b, $03 ; add_predef HealParty - predef_pointer $4661, $465f, $03 ; add_predef FlagPredef - predef_pointer $46de, $46dc, $03 ; add_predef ComputeHPBarPixels - predef_pointer $5a73, $5a71, $03 ; add_predef FillPP - predef_pointer $5892, $5890, $03 ; add_predef TryAddMonToParty - predef_pointer $5a9c, $5a9a, $03 ; add_predef AddTempmonToParty - predef_pointer $5b45, $5b43, $03 ; add_predef SentGetPkmnIntoFromBox - predef_pointer $5e74, $5e72, $03 ; add_predef SentPkmnIntoBox - predef_pointer $5f92, $5f90, $03 ; add_predef GiveEgg - predef_pointer $4725, $4723, $03 ; add_predef AnimateHPBar - predef_pointer $616d, $616b, $03 ; add_predef CalcPkmnStats - predef_pointer $6181, $617f, $03 ; add_predef CalcPkmnStatC - dwb $5a25, $04 ; add_predef CanLearnTMHMMove - dwb $5a56, $04 ; add_predef GetTMHMMove - dwb $4d88, $0a ; add_predef Predef_LinkTextbox ; $ 10 - dwb $4943, $0b ; add_predef PrintMoveDesc - dwb $5da9, $0f ; add_predef UpdatePlayerHUD - dwb $4648, $11 ; add_predef PlaceGraphic - dwb $570a, $0f ; add_predef CheckPlayerPartyForFitPkmn - dwb $5e97, $0f ; add_predef UpdateEnemyHUD - dwb $72c7, $0f ; add_predef StartBattle - dwb $7196, $0f ; add_predef FillInExpBar - dwb $7243, $0f ; add_predef GetMonBackpic ; $18 - dwb $7282, $0f ; add_predef GetMonFrontpic - dwb $6483, $10 ; add_predef LearnLevelMoves - dwb $64dd, $10 ; add_predef FillMoves - dwb $61e9, $10 ; add_predef EvolveAfterBattle - dwb $4e22, $0a ; add_predef TradeAnimationPlayer2 - dwb $4dea, $0a ; add_predef TradeAnimation - dwb $487d, $14 ; add_predef CopyPkmnToTempMon - dwb $5478, $14 ; add_predef ListMoves ; $20 - dwb $5437, $14 ; add_predef PlaceNonFaintStatus - dwb $53e4, $14 ; add_predef Predef22 - dwb $5364, $14 ; add_predef ListMovePP - dwb $52f1, $14 ; add_predef GetGender - dwb $4bae, $14 ; add_predef StatsScreenInit - dwb $4b3d, $14 ; add_predef DrawPlayerHP - dwb $4b41, $14 ; add_predef DrawEnemyHP - dwb $528f, $14 ; add_predef PrintTempMonStats ; $28 - dwb $4997, $14 ; add_predef GetTypeName - dwb $496d, $14 ; add_predef PrintMoveType - dwb $4986, $14 ; add_predef PrintType - dwb $4940, $14 ; add_predef PrintMonTypes - dwb $5749, $14 ; add_predef GetUnownLetter - dwb $7c76, $32 ; add_predef LoadPoisonBGPals - dwb $40d6, $32 ; add_predef Predef2F - dwb $5cc0, $02 ; add_predef InitSGBBorder ; $30 - dwb $4c2d, $02 ; add_predef Predef_LoadSGBLayout - dwb $5c7f, $24 ; add_predef Area_ - dwb $5072, $02 ; add_predef CheckContestMon - dwb $4513, $23 ; add_predef Predef_StartBattle - dwb $4355, $23 ; add_predef Predef35 - dwb $4355, $23 ; add_predef Predef36 - dwb $40d7, $33 ; add_predef PlayBattleAnim - dwb $40d6, $33 ; add_predef Predef38 ; $38 - dwb $40d6, $33 ; add_predef Predef39 - dwb $4001, $3f ; add_predef Predef3A - dwb $6e33, $04 ; add_predef PartyMonItemName - dwb $5780, $14 ; add_predef GetFrontpic - dwb $5803, $14 ; add_predef GetBackpic - dwb $58a0, $14 ; add_predef FrontpicPredef - dwb $58fa, $14 ; add_predef GetTrainerPic - dwb $4923, $0d ; add_predef DecompressPredef ; $40 - dwb $7a12, $3e ; add_predef CheckTypeMatchup - dwb $7981, $3e ; add_predef ConvertMon_1to2 - dwb $5786, $14 ; add_predef NewPokedexEntry - dwb $4a66, $70 + add_predef LearnMove ; $0 + add_predef Predef1 ; $1 + add_predef HealParty + add_predef FlagPredef + add_predef ComputeHPBarPixels + add_predef FillPP + add_predef TryAddMonToParty + add_predef AddTempmonToParty + add_predef SentGetPkmnIntoFromBox + add_predef SentPkmnIntoBox + add_predef GiveEgg + add_predef AnimateHPBar + add_predef CalcPkmnStats + add_predef CalcPkmnStatC + add_predef CanLearnTMHMMove + add_predef GetTMHMMove + add_predef Predef_LinkTextbox ; $ 10 + add_predef PrintMoveDesc + add_predef UpdatePlayerHUD + add_predef PlaceGraphic + add_predef CheckPlayerPartyForFitPkmn + add_predef UpdateEnemyHUD + add_predef StartBattle + add_predef FillInExpBar + add_predef GetMonBackpic ; $18 + add_predef GetMonFrontpic + add_predef LearnLevelMoves + add_predef FillMoves + add_predef EvolveAfterBattle + add_predef TradeAnimationPlayer2 + add_predef TradeAnimation + add_predef CopyPkmnToTempMon + add_predef ListMoves ; $20 + add_predef PlaceNonFaintStatus + add_predef Predef22 + add_predef ListMovePP + add_predef GetGender + add_predef StatsScreenInit + add_predef DrawPlayerHP + add_predef DrawEnemyHP + add_predef PrintTempMonStats ; $28 + add_predef GetTypeName + add_predef PrintMoveType + add_predef PrintType + add_predef PrintMonTypes + add_predef GetUnownLetter + add_predef LoadPoisonBGPals + add_predef Predef2F + add_predef InitSGBBorder ; $30 + add_predef Predef_LoadSGBLayout + add_predef Area_ + add_predef CheckContestMon + add_predef Predef_StartBattle + add_predef Predef35 + add_predef Predef36 + add_predef PlayBattleAnim + add_predef Predef38 ; $38 + add_predef Predef39 + add_predef Predef3A + add_predef PartyMonItemName + add_predef GetFrontpic + add_predef GetBackpic + add_predef FrontpicPredef + add_predef GetTrainerPic + add_predef DecompressPredef ; $40 + add_predef CheckTypeMatchup + add_predef ConvertMon_1to2 + add_predef NewPokedexEntry + add_predef UpdateTimePredef dbw $ff, InexplicablyEmptyFunction 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 diff --git a/engine/variables.asm b/engine/variables.asm index e352499f..4d67c2bf 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -35,26 +35,26 @@ GetVarAction_:: .VarActionTable: dwb wStringBuffer2, RETVAR_STRBUF2 - dwb $da22, RETVAR_STRBUF2 + dwb wPartyCount, RETVAR_STRBUF2 dwb .BattleResult, RETVAR_EXECUTE - dwb $d119, RETVAR_ADDR_DE - dwb $d157, RETVAR_STRBUF2 + dwb wBattleType, RETVAR_ADDR_DE + dwb wTimeOfDay, RETVAR_STRBUF2 dwb .CountCaughtMons, RETVAR_EXECUTE dwb .CountSeenMons, RETVAR_EXECUTE dwb .CountBadges, RETVAR_EXECUTE - dwb $d682, RETVAR_ADDR_DE + dwb wPlayerBikeSurfState, RETVAR_ADDR_DE dwb .PlayerFacing, RETVAR_EXECUTE - dwb $ff96, RETVAR_STRBUF2 + dwb hHours, RETVAR_STRBUF2 dwb .DayOfWeek, RETVAR_EXECUTE - dwb $da00, RETVAR_STRBUF2 - dwb $da01, RETVAR_STRBUF2 + dwb wMapGroup, RETVAR_STRBUF2 + dwb wMapNumber, RETVAR_STRBUF2 dwb .UnownCaught, RETVAR_EXECUTE - dwb $d083, RETVAR_STRBUF2 + dwb wPermission, RETVAR_STRBUF2 dwb .BoxFreeSpace, RETVAR_EXECUTE - dwb $d193, RETVAR_STRBUF2 - dwb $da03, RETVAR_STRBUF2 - dwb $da02, RETVAR_STRBUF2 - dwb $d97b, RETVAR_STRBUF2 + dwb wBugContestMinsRemaining, RETVAR_STRBUF2 + dwb wXCoord, RETVAR_STRBUF2 + dwb wYCoord, RETVAR_STRBUF2 + dwb wSpecialPhoneCallID, RETVAR_STRBUF2 dwb 0, 0 .CountCaughtMons: ; 41cf diff --git a/home/map.asm b/home/map.asm index ab040c6f..46231495 100644 --- a/home/map.asm +++ b/home/map.asm @@ -368,9 +368,9 @@ Function21ba:: ; 21ba (0:21ba) ld a, [wd0ab] ld [wMapNumber], a ld a, [wd0b3] - ld [wda03], a + ld [wXCoord], a ld a, [wd0b2] - ld hl, wda02 + ld hl, wYCoord add [hl] ld [hl], a ld c, a @@ -401,9 +401,9 @@ Function21f6:: ; 21f6 (0:21f6) ld a, [wd0b7] ld [wMapNumber], a ld a, [wd0bf] - ld [wda03], a + ld [wXCoord], a ld a, [wd0be] - ld hl, wda02 + ld hl, wYCoord add [hl] ld [hl], a ld c, a @@ -434,9 +434,9 @@ Function2232:: ; 2232 (0:2232) ld a, [wd093] ld [wMapNumber], a ld a, [wd09a] - ld [wda02], a + ld [wYCoord], a ld a, [wd09b] - ld hl, wda03 + ld hl, wXCoord add [hl] ld [hl], a ld c, a @@ -459,9 +459,9 @@ Function2263:: ; 2263 (0:2263) ld a, [wd09f] ld [wMapNumber], a ld a, [wd0a6] - ld [wda02], a + ld [wYCoord], a ld a, [wd0a7] - ld hl, wda03 + ld hl, wXCoord add [hl] ld [hl], a ld c, a @@ -963,9 +963,9 @@ RestoreFacingAfterWarp:: ld a, $5 call AddNTimes ld a, [hli] - ld [wda02], a + ld [wYCoord], a ld a, [hli] - ld [wda03], a + ld [wXCoord], a ld a, [hli] cp $ff jr nz, .asm_2592 @@ -985,7 +985,7 @@ BackUpWarp:: ; 2596 (0:2596) GetCoordOfUpperLeftCorner:: ; 25a9 (0:25a9) ld hl, wc700 - ld a, [wda03] + ld a, [wXCoord] bit 0, a jr nz, .asm_25b9 srl a @@ -1003,7 +1003,7 @@ GetCoordOfUpperLeftCorner:: ; 25a9 (0:25a9) add $6 ld c, a ld b, $0 - ld a, [wda02] + ld a, [wYCoord] bit 0, a jr nz, .asm_25d6 srl a @@ -1019,10 +1019,10 @@ GetCoordOfUpperLeftCorner:: ; 25a9 (0:25a9) ld [wOverworldMapAnchor], a ld a, h ld [wOverworldMapAnchor + 1], a - ld a, [wda02] + ld a, [wYCoord] and $1 ld [wd07f], a - ld a, [wda03] + ld a, [wXCoord] and $1 ld [wd080], a ret @@ -217,7 +217,9 @@ CopyDECoordsToMapObject: CopyObjectStruct_:: dr $86d7, $8876 CopyTempObjectToObjectStruct: - dr $8876, $8a7a + dr $8876, $8969 +Function8969: + dr $8969, $8a7a QueueFollowerFirstStep: dr $8a7a, $8ac9 Sine_e:: @@ -225,10 +227,14 @@ Sine_e:: INCLUDE "engine/predef.asm" -Function8c2d: - dr $8c2d, $91e5 +Predef_LoadSGBLayout: + dr $8c2d, $9072 +CheckContestMon: + dr $9072, $91e5 ApplyMonOrTrainerPals: - dr $91e5, $9cfd + dr $91e5, $9cc0 +InitSGBBorder: + dr $9cc0, $9cfd InitCGBPals:: ; 9cfd dr $9cfd, $bc3a @@ -258,7 +264,9 @@ INCLUDE "engine/specials.asm" ComputeHPBarPixels: IF DEF(GOLD) - dr $c6de, $d1e2 + dr $c6de, $c725 +AnimateHPBar: + dr $c725, $d1e2 ReceiveItem_:: dr $d1e2, $d21a TossItem_:: @@ -268,9 +276,33 @@ CheckItem_:: GetTMHMNumber:: dr $d414, $d434 CheckTossableItem_:: - dr $d434, $e03f + dr $d434, $d892 + +TryAddMonToParty:: + dr $d892, $da73 + +FillPP:: + dr $da73, $da9c + +AddTempmonToParty:: + dr $da9c, $db45 + +SentGetPkmnIntoFromBox:: + dr $db45, $de74 + +SentPkmnIntoBox:: + dr $de74, $df92 + +GiveEgg:: + dr $df92, $e03f RemoveMonFromPartyOrBox: - dr $e03f, $e513 + dr $e03f, $e16d + +CalcPkmnStats:: + dr $e16d, $e181 + +CalcPkmnStatC:: + dr $e181, $e513 CheckCurPartyMonFainted: dr $e513, $e6a9 Functione6a9: @@ -288,7 +320,9 @@ Functionf900: ENDC IF DEF(SILVER) - dr $c6dc, $d1e0 + dr $c6dc, $c723 +AnimateHPBar: + dr $c723, $d1e0 ReceiveItem_:: dr $d1e0, $d218 TossItem_:: @@ -298,9 +332,33 @@ CheckItem_:: GetTMHMNumber:: dr $d412, $d432 CheckTossableItem_:: - dr $d432, $e03d + dr $d432, $d890 + +TryAddMonToParty:: + dr $d890, $da71 + +FillPP:: + dr $da71, $da9a + +AddTempmonToParty:: + dr $da9a, $db43 + +SentGetPkmnIntoFromBox:: + dr $db43, $de72 + +SentPkmnIntoBox:: + dr $de72, $df90 + +GiveEgg:: + dr $df90, $e03d RemoveMonFromPartyOrBox: - dr $e03d, $e511 + dr $e03d, $e16b + +CalcPkmnStats:: + dr $e16b, $e17f + +CalcPkmnStatC:: + dr $e17f, $e511 CheckCurPartyMonFainted: dr $e511, $e6a7 Functione6a9: @@ -329,13 +387,32 @@ Function11917: Function1192e: dr $1192e, $11934 Function11934: - dr $11934, $11aa3 + dr $11934, $11a25 + +CanLearnTMHMMove:: + dr $11a25, $11a56 + +GetTMHMMove:: + dr $11a56, $11aa3 NamingScreen_: dr $11aa3, $11aad NamingScreen: - dr $11aad, $13a5f + dr $11aad, $126fd +Function126fd: + dr $126fd, $12e33 + +PartyMonItemName:: + dr $12e33, $1399d +Function1399d: + dr $1399d, $13a5f Function13a5f: - dr $13a5f, $13e03 + dr $13a5f, $13d64 +Function13d64: + dr $13d64, $13dce +Function13dce: + dr $13dce, $13ded +Function13ded: + dr $13ded, $13e03 SECTION "bank5", ROMX, BANK[$5] dr $14000, $14032 @@ -354,7 +431,9 @@ RefreshSprites:: ; 1414b Function1415c:: ; 1415c dr $1415c, $1416d Function1416d:: ; 1416d - dr $1416d, $14317 + dr $1416d, $14226 +Function14226: + dr $14226, $14317 DoesSpriteHaveFacings_:: ; 14317 dr $14317, $14334 GetSpritePalette_:: ; 14334 @@ -370,13 +449,29 @@ TryLoadSaveFile: ; 14ef5 RunMapSetupScript:: dr $15484, $15612 Function15612:: ; 15612 - dr $15612, $159b0 + dr $15612, $15871 +Function15871: + dr $15871, $159b0 Function159b0: - dr $159b0, $16e3a + dr $159b0, $1646d +Function1646d: + dr $1646d, $16935 +Function16935: + dr $16935, $16989 +Function16989: + dr $16989, $16b8c +Function16b8c: + dr $16b8c, $16e3a Function16e3a: - dr $16e3a, $171d1 + dr $16e3a, $16ff7 +Function16ff7: + dr $16ff7, $171d1 Function171d1: - dr $171d1, $1783e + dr $171d1, $177a5 +Function177a5: + dr $177a5, $177c4 +Function177c4: + dr $177c4, $1783e SECTION "bank6", ROMX, BANK[$6] dr $18000, $1bdbc @@ -406,29 +501,100 @@ InitVerticalMenuCursor_:: InitScrollingMenu:: dr $244d7, $244f3 ScrollingMenu_:: - dr $244f3, $24b8d + dr $244f3, $24a10 +Function24a10: + dr $24a10, $24a4d +Function24a4d: + dr $24a4d, $24a76 +Function24a76: + dr $24a76, $24b8d Function24b8d: - dr $24b8d, $2692d + dr $24b8d, $267ca +Function267ca: + dr $267ca, $2692d InitDecorations: ; 2692d - dr $2692d, $28000 + dr $2692d, $271be +Function271be: + dr $271be, $27216 +Function27216: + dr $27216, $28000 SECTION "banka", ROMX, BANK[$a] - dr $28000, $29dff + dr $28000, $28d88 + +Predef_LinkTextbox:: + dr $28d88, $28dea + +TradeAnimation:: + dr $28dea, $28e22 + +TradeAnimationPlayer2:: + dr $28e22, $29a47 +Function29a47: + dr $29a47, $29ac7 +Function29ac7: + dr $29ac7, $29ad9 +Function29ad9: + dr $29ad9, $29b22 +Function29b22: + dr $29b22, $29b2b +Function29b2b: + dr $29b2b, $29b34 +Function29b34: + dr $29b34, $29b4b +Function29b4b: + dr $29b4b, $29bcc +Function29bcc: + dr $29bcc, $29c71 +Function29c71: + dr $29c71, $29c8d +Function29c8d: + dr $29c8d, $29cba +Function29cba: + dr $29cba, $29ccf +Function29ccf: + dr $29ccf, $29ce4 +Function29ce4: + dr $29ce4, $29cf9 +Function29cf9: + dr $29cf9, $29d01 +Function29d01: + dr $29d01, $29d4e +Function29d4e: + dr $29d4e, $29dff Function29dff: dr $29dff, $2a4bf MysteryGift_CopyReceivedDecosToPC: - dr $2a4bf, $2a8e0 + dr $2a4bf, $2a4e7 +Function2a4e7: + dr $2a4e7, $2a7d7 +Function2a7d7: + dr $2a7d7, $2a8e0 JumpRoamMons: - dr $2a8e0, $2c000 + dr $2a8e0, $2a9f7 +Function2a9f7: + dr $2a9f7, $2aa6b +Function2aa6b: + dr $2aa6b, $2aab3 +Function2aab3: + dr $2aab3, $2c000 SECTION "bankb", ROMX, BANK[$b] - dr $2c000, $30000 + dr $2c000, $2c352 +Function2c352: + dr $2c352, $2c943 + +PrintMoveDesc:: + dr $2c943, $30000 SECTION "bankc", ROMX, BANK[$c] dr $30000, $34000 SECTION "bankd", ROMX, BANK[$d] - dr $34000, $38000 + dr $34000, $34923 + +DecompressPredef:: + dr $34923, $38000 SECTION "banke", ROMX, BANK[$e] dr $38000, $398f2 @@ -437,7 +603,10 @@ Battle_GetTrainerName:: ; 398f2 dr $398f2, $3c000 SECTION "bankf", ROMX, BANK[$f] - dr $3c000, $3dda9 + dr $3c000, $3d70a + +CheckPlayerPartyForFitPkmn:: + dr $3d70a, $3dda9 UpdatePlayerHUD:: dr $3dda9, $3de97 @@ -445,17 +614,41 @@ UpdatePlayerHUD:: UpdateEnemyHUD:: dr $3de97, $3ec11 BattleRandom_:: ; 3ec11 - dr $3ec11, $3f55d + dr $3ec11, $3f196 + +FillInExpBar:: + dr $3f196, $3f243 + +GetMonBackpic:: + dr $3f243, $3f282 + +GetMonFrontpic:: + dr $3f282, $3f2c7 + +StartBattle:: + dr $3f2c7, $3f55d Function3f55d: dr $3f55d, $40000 SECTION "bank10", ROMX, BANK[$10] dr $40000, $41afe Moves:: - dr $41afe, $44000 + dr $41afe, $421e9 + +EvolveAfterBattle:: + dr $421e9, $42483 + +LearnLevelMoves:: + dr $42483, $424dd + +FillMoves:: + dr $424dd, $44000 SECTION "bank11", ROMX, BANK[$11] - dr $44000, $44870 + dr $44000, $44648 + +PlaceGraphic:: + dr $44648, $44870 DeletePartyMonMail: dr $44870, $48000 @@ -467,7 +660,67 @@ SECTION "bank13", ROMX, BANK[$13] SECTION "bank14", ROMX, BANK[$14] Function50000: - dr $50000, $51b0b + dr $50000, $5087d + +CopyPkmnToTempMon:: + dr $5087d, $50940 + +PrintMonTypes:: + dr $50940, $5096d + +PrintMoveType:: + dr $5096d, $50986 + +PrintType:: + dr $50986, $50997 + +GetTypeName:: + dr $50997, $50b3d + +DrawPlayerHP:: + dr $50b3d, $50b41 + +DrawEnemyHP:: + dr $50b41, $50bae + +StatsScreenInit:: + dr $50bae, $5128f + +PrintTempMonStats:: + dr $5128f, $512f1 + +GetGender:: + dr $512f1, $51364 + +ListMovePP:: + dr $51364, $513e4 + +Predef22:: + dr $513e4, $51437 + +PlaceNonFaintStatus:: + dr $51437, $51478 + +ListMoves:: + dr $51478, $51749 + +GetUnownLetter:: + dr $51749, $51780 + +GetFrontpic:: + dr $51780, $51786 + +NewPokedexEntry:: + dr $51786, $51803 + +GetBackpic:: + dr $51803, $518a0 + +FrontpicPredef:: + dr $518a0, $518fa + +GetTrainerPic:: + dr $518fa, $51b0b BaseData:: ; 51b0b dr $51b0b, $53a83 UnknownEggPic:: ; 53a83 @@ -528,7 +781,11 @@ ResetClock_: dr $8c17a, $8c310 DeleteSaveData_: - dr $8c310, $8c356 + dr $8c310, $8c355 + +Predef35:: +Predef36:: + ret UpdateTimeOfDayPal:: ; 8c356 dr $8c356, $8c366 @@ -543,10 +800,22 @@ FadeInPalettes:: ; 8c3a0 dr $8c3a0, $8c3ab Function8c3ab:: ; 8c3ab - dr $8c3ab, $8c3e9 + dr $8c3ab, $8c3b9 + +Function8c3b9: + dr $8c3b9, $8c3c4 + +Function8c3c4: + dr $8c3c4, $8c3e9 Function8c3e9:: ; 8c3e9 - dr $8c3e9, $8d174 + dr $8c3e9, $8c513 + +Predef_StartBattle:: + dr $8c513, $8ce7c + +Function8ce7c: + dr $8ce7c, $8d174 ClearAnimatedObjectBuffer: dr $8d174, $8d18a @@ -563,13 +832,24 @@ ReinitAnimatedObjectFrame_:: ; 8d332 SECTION "bank24", ROMX, BANK[$24] dr $90000, $90641 InitClock: - dr $90641, $90b0f + dr $90641, $908dc +Function908dc: + dr $908dc, $90a1b +Function90a1b: + dr $90a1b, $90a54 +Function90a54: + dr $90a54, $90a8d +Function90a8d: + dr $90a8d, $90b0f PrintHour: dr $90b0f, $9188a Function9188a: dr $9188a, $919c1 Function919c1: - dr $919c1, $92c36 + dr $919c1, $91c7f + +Area_:: + dr $91c7f, $92c36 Function92c36: dr $92c36, $94000 @@ -590,7 +870,10 @@ ScriptEvents:: ; 96b91 dr $96b91, $97365 CallCallback:: ; 97365 - dr $97365, $97c2a + dr $97365, $97a59 + +Function97a59: + dr $97a59, $97c2a Function97c2a:: ; 97c2a dr $97c2a, $98000 @@ -648,15 +931,34 @@ PlayerIcon: SECTION "bank31", ROMX, BANK[$31] dr $c4000, $c7a40 Functionc7a40: - dr $c7a40, $c8000 + dr $c7a40, $c7a5a +Functionc7a5a: + dr $c7a5a, $c7bad +Functionc7bad: + dr $c7bad, $c7bbf +Functionc7bbf: + dr $c7bbf, $c8000 SECTION "bank32", ROMX, BANK[$32] BattleAnimations:: ; Not actually where it is, I just needed the label for BANK to work - dr $c8000, $cc000 + dr $c8000, $c80d6 + +Predef2F:: + dr $c80d6, $cbc76 + +LoadPoisonBGPals:: + dr $cbc76, $cc000 SECTION "bank33", ROMX, BANK[$33] BattleAnimCommands:: ; Not actually where it is, I just needed the label for BANK to work - dr $cc000, $d0000 + dr $cc000, $cc0d6 + +Predef38:: +Predef39:: + ret + +PlayBattleAnim:: + dr $cc0d7, $d0000 SECTION "bank34", ROMX, BANK[$34] dr $d0000, $d4000 @@ -751,12 +1053,24 @@ Shrink1Pic: Shrink2Pic: dr $fb64e, $fb7f7 Functionfb7f7: - dr $fb7f7, $fb981 -Functionfb981: - dr $fb981, $fc000 + dr $fb7f7, $fb94b +Functionfb94b: + dr $fb94b, $fb981 +ConvertMon_1to2: + dr $fb981, $fba12 + +CheckTypeMatchup:: + dr $fba12, $fbc3c +Functionfbc3c: + dr $fbc3c, $fbdd6 +Functionfbdd6: + dr $fbdd6, $fc000 SECTION "bank3f", ROMX, BANK[$3f] - dr $fc000, $100000 + nop +Predef3A:: + ret + dr $fc002, $100000 SECTION "bank40", ROMX, BANK[$40] BattleText:: ; Not actually where it is, I just needed the label for BANK to work @@ -966,7 +1280,9 @@ SECTION "bank6f", ROMX, BANK[$6f] dr $1bc000, $1c0000 SECTION "bank70", ROMX, BANK[$70] - dr $1c0000, $1c0de9 + dr $1c0000, $1c0a66 +UpdateTimePredef:: + dr $1c0a66, $1c0de9 _DudeAutoInput_A:: dr $1c0de9, $1c4000 @@ -2688,7 +2688,7 @@ wd18f:: ds 1 ; d18f wd190:: ds 1 ; d190 wd191:: ds 1 ; d191 wd192:: ds 1 ; d192 -wd193:: ds 1 ; d193 +wBugContestMinsRemaining:: ds 1 ; d193 wd194:: ds 1 ; d194 wd195:: ds 1 ; d195 wd196:: ds 1 ; d196 @@ -3444,7 +3444,7 @@ wd977:: ds 1 ; d977 wd978:: ds 1 ; d978 wd979:: ds 1 ; d979 wd97a:: ds 1 ; d97a -wd97b:: ds 1 ; d97b +wSpecialPhoneCallID:: ds 1 ; d97b wd97c:: ds 1 ; d97c wd97d:: ds 1 ; d97d wd97e:: ds 1 ; d97e @@ -3580,8 +3580,8 @@ wd9ff:: ds 1 ; d9ff wMapGroup:: ds 1 ; da00 wMapNumber:: ds 1 ; da01 -wda02:: ds 1 ; da02 -wda03:: ds 1 ; da03 +wYCoord:: ds 1 ; da02 +wXCoord:: ds 1 ; da03 wda04:: ds 1 ; da04 wda05:: ds 1 ; da05 wda06:: ds 1 ; da06 |