From 439efda1ba940b010786be1186007355adf23965 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 15:55:39 -0400 Subject: Champion's room; resolve predefs --- engine/predefs.asm | 221 +++++++++++++++++++++++++++-------------------------- 1 file changed, 114 insertions(+), 107 deletions(-) (limited to 'engine/predefs.asm') diff --git a/engine/predefs.asm b/engine/predefs.asm index 3ec98577..98a5b2d2 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -1,8 +1,8 @@ GetPredefPointer: ; f67ed (3d:67ed) -; Store the contents of the register -; pairs (hl, de, bc) at wPredefRegisters. -; Then put the bank and address of predef -; wPredefID in [wPredefBank] and hl. + ; Store the contents of the register + ; pairs (hl, de, bc) at wPredefRegisters. + ; Then put the bank and address of predef + ; wPredefID in [wPredefBank] and hl. ld a,h ld [wPredefRegisters],a @@ -35,11 +35,11 @@ GetPredefPointer: ; f67ed (3d:67ed) ld d,h ld e,l - ; get bank of predef routine + ; get bank of predef routine ld a,[de] ld [wPredefBank],a - ; get pointer + ; get pointer inc de ld a,[de] ld l,a @@ -50,104 +50,111 @@ GetPredefPointer: ; f67ed (3d:67ed) ret PredefPointers:: ; f681d (3d:681d) -; these are pointers to ASM routines. -; they appear to be used in overworld map scripts. - dbw BANK(DrawPlayerHUDAndHPBar), DrawPlayerHUDAndHPBar ; add_predef DrawPlayerHUDAndHPBar - dbw $3d, $61f9 ; add_predef CopyUncompressedPicToTilemap - dbw $3d, $61a6 ; add_predef Func_3f073 - dbw $0b, $7d79 ; add_predef ScaleSpriteByTwo - dbw $3d, $6178 ; add_predef LoadMonBackPic - dbw $1e, $5c16 ; add_predef CopyDownscaledMonTiles - dbw $03, $70a7 ; add_predef LoadMissableObjects - dbw $03, $752b ; add_predef HealParty - dbw $1e, $4d97 ; add_predef MoveAnimation; 08 play move animation - dbw $03, $75a4 ; add_predef DivideBCDPredef - dbw $03, $75a4 ; add_predef DivideBCDPredef2 - dbw $03, $76a3 ; add_predef AddBCDPredef - dbw $03, $76bc ; add_predef SubBCDPredef - dbw $03, $75a4 ; add_predef DivideBCDPredef3 - dbw $03, $75a4 ; add_predef DivideBCDPredef4 - dbw $03, $76d6 ; add_predef InitPlayerData - dbw $03, $74ec ; add_predef FlagActionPredef - dbw $03, $7053 ; add_predef HideObject - dbw $03, $7022 ; add_predef IsObjectHidden - dbw $03, $43de ; add_predef ApplyOutOfBattlePoisonDamage - dbw $0f, $4ae8 ; add_predef AnyPartyAlive - dbw $03, $7044 ; add_predef ShowObject - dbw $03, $7044 ; add_predef ShowObject2 - dbw $03, $6d1b ; add_predef ReplaceTileBlock - dbw $03, $76d6 ; add_predef InitPlayerData2 - dbw $03, $44f4 ; add_predef LoadTilesetHeader - dbw $0e, $700c ; add_predef LearnMoveFromLevelUp - dbw $01, $6bc8 ; add_predef LearnMove - dbw $03, $7735 ; add_predef IsItemInBag_ - dbw $03, $3ef9 ; dbw $03,CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the ba - dbw $03, $3e3f ; dbw $03,GiveItem - dbw $0a, $7d4c ; add_predef InvertBGPal_4Frames - dbw $03, $774a ; add_predef FindPathToPlayer - dbw $0a, $7d67 ; add_predef Func_480ff - dbw $03, $77b9 ; add_predef CalcPositionOfPlayerRelativeToNPC - dbw $03, $7830 ; add_predef ConvertNPCMovementDirectionsToJoypadMasks - dbw $0a, $7d8d ; add_predef Func_48125 - dbw $03, $78ad ; add_predef UpdateHPBar - dbw $03, $786c ; add_predef HPBarLength - dbw $01, $5b64 ; add_predef Diploma_TextBoxBorder - dbw $0f, $6e8e ; add_predef DoubleOrHalveSelectedStats - dbw $10, $4000 ; add_predef ShowPokedexMenu - dbw $0e, $6dc6 ; add_predef EvolutionAfterBattle - dbw $1c, $7ae5 ; add_predef SaveSAVtoSRAM0 - dbw $3d, $5ff8 ; add_predef InitOpponent - dbw $01, $5b13 ; add_predef CableClub_Run - dbw $03, $6880 ; add_predef DrawBadges - dbw $10, $53f6 ; add_predef ExternalClockTradeAnim - dbw $1c, $49d7 ; add_predef BattleTransition - dbw $1e, $5f7b ; add_predef CopyTileIDsFromList - dbw $10, $5997 ; add_predef PlayIntro - dbw $1e, $59c5 ; add_predef Func_79869 - dbw $1c, $4bd0 ; add_predef FlashScreen - dbw $03, $42d1 ; add_predef GetTileAndCoordsInFrontOfPlayer - dbw $04, $54cc ; add_predef StatusScreen - dbw $04, $56fb ; add_predef StatusScreen2 - dbw $10, $53e5 ; add_predef InternalClockTradeAnim - dbw $15, $685b ; add_predef TrainerEngage - dbw $10, $509d ; add_predef IndexToPokedex - dbw $01, $600d ; add_predef DisplayPicCenteredOrUpperRight; 3B display pic? - dbw $03, $6dd1 ; add_predef UsedCut - dbw $10, $4312 ; add_predef ShowPokedexData - dbw $0e, $713f ; add_predef WriteMonMoves - dbw $1c, $7a67 ; add_predef SaveSAV - dbw $1c, $61f8 ; add_predef LoadSGB - dbw $03, $6f93 ; add_predef MarkTownVisitedAndLoadMissableObjects - dbw $17, $5b93 ; add_predef SetPartyMonTypes - dbw $04, $62f0 ; add_predef CanLearnTM - dbw $04, $631d ; add_predef TMToMove - dbw $1c, $5eb3 ; add_predef Func_71ddf - dbw $17, $40d4 ; add_predef StarterDex ; 46 - dbw $03, $7161 ; add_predef _AddPartyMon - dbw $03, $78ad ; add_predef UpdateHPBar2 - dbw $0f, $4eb1 ; add_predef DrawEnemyHUDAndHPBar - dbw $1c, $4fe4 ; add_predef LoadTownMap_Nest - dbw $09, $7d20 ; add_predef PrintMonType - dbw $10, $516f ; add_predef EmotionBubble; 4C player exclamation - dbw $01, $5b63 ; add_predef EmptyFunc3; return immediately - dbw $01, $625d ; add_predef AskName - dbw $06, $66e5 ; add_predef PewterGuys - dbw $1c, $7b56 ; add_predef SaveSAVtoSRAM2 - dbw $1c, $7a24 ; add_predef LoadSAVCheckSum2 - dbw $1c, $7959 ; add_predef LoadSAV - dbw $1c, $7b32 ; add_predef SaveSAVtoSRAM1 - dbw $1c, $5b86 ; add_predef DoInGameTradeDialogue ; 54 initiate trade - dbw $3c, $4f26 ; add_predef HallOfFamePC - dbw $11, $4169 ; add_predef DisplayDexRating - dbw $1e, $4615 ; dbw $1E, _LeaveMapAnim ; wrong bank - dbw $1e, $4567 ; dbw $1E, EnterMapAnim ; wrong bank - dbw $03, $4309 ; add_predef GetTileTwoStepsInFrontOfPlayer - dbw $03, $4356 ; add_predef CheckForCollisionWhenPushingBoulder - dbw $3d, $5b06 ; add_predef PrintStrengthTxt - dbw $01, $4d55 ; add_predef PickupItem - dbw $09, $7d4d ; add_predef PrintMoveType - dbw $03, $72f9 ; add_predef LoadMovePPs - dbw $04, $5468 ; add_predef DrawHP ; 5F - dbw $04, $546f ; add_predef DrawHP2 - dbw $07, $4264 ; add_predef Func_1c9c6 - dbw $16, $4ecc ; add_predef OaksAideScript + ; these are pointers to ASM routines. + ; they appear to be used in overworld map scripts. + const_def + add_predef DrawPlayerHUDAndHPBar + add_predef CopyUncompressedPicToTilemap + add_predef AnimateSendingOutMon + add_predef ScaleSpriteByTwo + add_predef LoadMonBackPic + add_predef CopyDownscaledMonTiles + add_predef Func_f0a7 + add_predef HealParty + add_predef MoveAnimation ; 08 play move animation (1e:4d97) + add_predef DivideBCDPredef + add_predef DivideBCDPredef2 + add_predef AddBCDPredef + add_predef SubBCDPredef + add_predef DivideBCDPredef3 + add_predef DivideBCDPredef4 + add_predef InitPlayerData + add_predef FlagActionPredef + add_predef HideObject + add_predef IsObjectHidden + add_predef ApplyOutOfBattlePoisonDamage + add_predef AnyPartyAlive + add_predef ShowObject + add_predef ShowObject2 + add_predef ReplaceTileBlock + add_predef InitPlayerData2 + add_predef LoadTilesetHeader + add_predef LearnMoveFromLevelUp + add_predef LearnMove + add_predef GetQuantityOfItemInBag + + predef_const CheckForHiddenObjectOrBookshelfOrCardKeyDoor + predef_const GiveItem + dbw $03, CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; home bank + dbw $03, GiveItem ; home bank + + add_predef InvertBGPal_4Frames + add_predef FindPathToPlayer + add_predef PredefShakeScreenVertically + add_predef CalcPositionOfPlayerRelativeToNPC + add_predef ConvertNPCMovementDirectionsToJoypadMasks + add_predef PredefShakeScreenHorizontally + add_predef UpdateHPBar + add_predef HPBarLength + add_predef Diploma_TextBoxBorder + add_predef DoubleOrHalveSelectedStats + add_predef ShowPokedexMenu + add_predef EvolutionAfterBattle + add_predef SaveSAVtoSRAM0 + add_predef InitOpponent + add_predef CableClub_Run + add_predef DrawBadges + add_predef ExternalClockTradeAnim + add_predef BattleTransition + add_predef CopyTileIDsFromList + add_predef PlayIntro + add_predef GetMoveSoundB + add_predef FlashScreen + add_predef GetTileAndCoordsInFrontOfPlayer + add_predef StatusScreen + add_predef StatusScreen2 + add_predef InternalClockTradeAnim + add_predef TrainerEngage + add_predef IndexToPokedex + add_predef DisplayPicCenteredOrUpperRight ; 3B display pic? (01:600d) + add_predef UsedCut + add_predef ShowPokedexData + add_predef WriteMonMoves + add_predef SaveSAV + add_predef LoadSGB + add_predef MarkTownVisitedAndLoadMissableObjects + add_predef SetPartyMonTypes + add_predef CanLearnTM + add_predef TMToMove + add_predef _RunPaletteCommand + add_predef StarterDex ; 46 (17:40d4) + add_predef _AddPartyMon + add_predef UpdateHPBar2 + add_predef DrawEnemyHUDAndHPBar + add_predef LoadTownMap_Nest + add_predef PrintMonType + add_predef EmotionBubble ; 4C player exclamation (10:516f) + add_predef EmptyFunc3 ; return immediately (01:5b63) + add_predef AskName + add_predef PewterGuys + add_predef SaveSAVtoSRAM2 + add_predef LoadSAV2 + add_predef LoadSAV + add_predef SaveSAVtoSRAM1 + add_predef DoInGameTradeDialogue ; 54 initiate trade (1c:5b86) + add_predef HallOfFamePC + add_predef DisplayDexRating + predef_const _LeaveMapAnim + predef_const EnterMapAnim + dbw $1E, _LeaveMapAnim ; wrong bank + dbw $1E, EnterMapAnim ; wrong bank + add_predef GetTileTwoStepsInFrontOfPlayer + add_predef CheckForCollisionWhenPushingBoulder + add_predef PrintStrengthTxt + add_predef PickUpItem + add_predef PrintMoveType + add_predef LoadMovePPs + add_predef DrawHP ; 5F (04:5468) + add_predef DrawHP2 + add_predef DisplayElevatorFloorMenu + add_predef OaksAideScript -- cgit v1.3.1-sl0p From 3ebb84d4c5cb8f37831a1c8c93c31f8d0715a6d0 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 16:16:19 -0400 Subject: Fix hide show constants --- constants/hide_show_constants.asm | 92 ++++++++++++++++++++------------------- engine/predefs.asm | 60 +++++++++++++------------ scripts/silphco11_2.asm | 4 +- 3 files changed, 80 insertions(+), 76 deletions(-) (limited to 'engine/predefs.asm') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 4297bc2e..f23c57aa 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -4,7 +4,7 @@ ; (they are either items or sprites that deactivate after battle ; and are detected in wMissableObjectList) -const_value = 0 + const_def const HS_PALLET_TOWN_OAK ; 00 const HS_LYING_OLD_MAN ; 01 @@ -62,17 +62,17 @@ const_value = 0 const HS_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 X const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 X const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 X - const HS_POKEMONTOWER_2_RIVAL ; 38 - const HS_POKEMONTOWER_3_ITEM ; 39 X - const HS_POKEMONTOWER_4_ITEM_1 ; 3A X - const HS_POKEMONTOWER_4_ITEM_2 ; 3B X - const HS_POKEMONTOWER_4_ITEM_3 ; 3C X - const HS_POKEMONTOWER_5_ITEM ; 3D X - const HS_POKEMONTOWER_6_ITEM_1 ; 3E X - const HS_POKEMONTOWER_6_ITEM_2 ; 3F X - const HS_POKEMONTOWER_7_ROCKET_1 ; 40 X - const HS_POKEMONTOWER_7_ROCKET_2 ; 41 X - const HS_POKEMONTOWER_7_ROCKET_3 ; 42 + const HS_UNKNOWN_DUNGEON_1_ITEM_4 ; 38 X + const HS_POKEMONTOWER_2_RIVAL ; 39 X + const HS_POKEMONTOWER_3_ITEM ; 3A X + const HS_POKEMONTOWER_4_ITEM_1 ; 3B X + const HS_POKEMONTOWER_4_ITEM_2 ; 3C X + const HS_POKEMONTOWER_4_ITEM_3 ; 3D X + const HS_POKEMONTOWER_5_ITEM ; 3E X + const HS_POKEMONTOWER_6_ITEM_1 ; 3F X + const HS_POKEMONTOWER_6_ITEM_2 ; 40 X + const HS_POKEMONTOWER_7_JESSIE ; 41 X + const HS_POKEMONTOWER_7_JAMES ; 42 const HS_POKEMONTOWER_7_MR_FUJI ; 43 const HS_LAVENDER_HOUSE_1_MR_FUJI ; 44 const HS_CELADON_MANSION_5_GIFT ; 45 @@ -145,8 +145,8 @@ const_value = 0 const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 88 const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 89 XXX never (de)activated? const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 8A - -const_value SET $8d + const HS_ROCKET_HIDEOUT_4_ITEM_6 ; 8B + const HS_ROCKET_HIDEOUT_4_ITEM_7 ; 8C const HS_SILPH_CO_2F_1 ; 8D const HS_SILPH_CO_2F_2 ; 8E const HS_SILPH_CO_2F_3 ; 8F @@ -195,37 +195,39 @@ const_value SET $8d const HS_SILPH_CO_10F_ITEM_3 ; BA XXX sprite doesn't exist const HS_SILPH_CO_11F_1 ; BB X const HS_SILPH_CO_11F_2 ; BC X - const HS_SILPH_CO_11F_3 ; BD X - const HS_MAP_F4_1 ; BE X - const HS_MANSION_2_ITEM ; BF X - const HS_MANSION_3_ITEM_1 ; C0 X - const HS_MANSION_3_ITEM_2 ; C1 X - const HS_MANSION_4_ITEM_1 ; C2 X - const HS_MANSION_4_ITEM_2 ; C3 X - const HS_MANSION_4_ITEM_3 ; C4 X - const HS_MANSION_4_ITEM_4 ; C5 X - const HS_MANSION_4_ITEM_5 ; C6 X - const HS_SAFARI_ZONE_EAST_ITEM_1 ; C7 X - const HS_SAFARI_ZONE_EAST_ITEM_2 ; C8 X - const HS_SAFARI_ZONE_EAST_ITEM_3 ; C9 X - const HS_SAFARI_ZONE_EAST_ITEM_4 ; CA X - const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CB X - const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CC X - const HS_SAFARI_ZONE_WEST_ITEM_1 ; CD X - const HS_SAFARI_ZONE_WEST_ITEM_2 ; CE X - const HS_SAFARI_ZONE_WEST_ITEM_3 ; CF X - const HS_SAFARI_ZONE_WEST_ITEM_4 ; D0 X - const HS_SAFARI_ZONE_CENTER_ITEM ; D1 X - const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; D2 X - const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; D3 X - const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D4 X - const HS_MEWTWO ; D5 X - const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D6 - const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D7 - const HS_VICTORY_ROAD_1_ITEM_1 ; D8 - const HS_VICTORY_ROAD_1_ITEM_2 ; D9 - -const_value SET $de + const HS_SILPH_CO_11F_JESSIE ; BD X + const HS_SILPH_CO_11F_JAMES ; BE X + const HS_MAP_F4_1 ; BF X + const HS_MANSION_2_ITEM ; C0 X + const HS_MANSION_3_ITEM_1 ; C1 X + const HS_MANSION_3_ITEM_2 ; C2 X + const HS_MANSION_4_ITEM_1 ; C3 X + const HS_MANSION_4_ITEM_2 ; C4 X + const HS_MANSION_4_ITEM_3 ; C5 X + const HS_MANSION_4_ITEM_4 ; C6 X + const HS_MANSION_4_ITEM_5 ; C7 X + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C8 X + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C9 X + const HS_SAFARI_ZONE_EAST_ITEM_3 ; CA X + const HS_SAFARI_ZONE_EAST_ITEM_4 ; CB X + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CC X + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CD X + const HS_SAFARI_ZONE_WEST_ITEM_1 ; CE X + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CF X + const HS_SAFARI_ZONE_WEST_ITEM_3 ; D0 X + const HS_SAFARI_ZONE_WEST_ITEM_4 ; D1 X + const HS_SAFARI_ZONE_CENTER_ITEM ; D2 X + const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; D3 X + const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; D4 X + const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D5 X + const HS_UNKNOWN_DUNGEON_2_ITEM_4 ; D6 + const HS_MEWTWO ; D7 + const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D8 + const HS_UNKNOWN_DUNGEON_3_ITEM_2 ; D9 + const HS_UNKNOWN_DUNGEON_3_ITEM_3 ; DA + const HS_UNKNOWN_DUNGEON_3_ITEM_4 ; DB + const HS_VICTORY_ROAD_1_ITEM_1 ; DC + const HS_VICTORY_ROAD_1_ITEM_2 ; DD const HS_CHAMPIONS_ROOM_OAK ; DE const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; DF const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; E0 diff --git a/engine/predefs.asm b/engine/predefs.asm index 98a5b2d2..9a97fe95 100755 --- a/engine/predefs.asm +++ b/engine/predefs.asm @@ -4,48 +4,48 @@ GetPredefPointer: ; f67ed (3d:67ed) ; Then put the bank and address of predef ; wPredefID in [wPredefBank] and hl. - ld a,h - ld [wPredefRegisters],a - ld a,l - ld [wPredefRegisters + 1],a + ld a, h + ld [wPredefRegisters], a + ld a, l + ld [wPredefRegisters + 1], a - ld hl,wPredefRegisters + 2 - ld a,d - ld [hli],a - ld a,e - ld [hli],a + ld hl, wPredefRegisters + 2 + ld a, d + ld [hli], a + ld a, e + ld [hli], a - ld a,b - ld [hli],a - ld [hl],c + ld a, b + ld [hli], a + ld [hl], c - ld hl,PredefPointers - ld de,0 + ld hl, PredefPointers + ld de, 0 - ld a,[wPredefID] - ld e,a + ld a, [wPredefID] + ld e, a add a add e - ld e,a - jr nc,.nocarry + ld e, a + jr nc, .nocarry inc d .nocarry - add hl,de - ld d,h - ld e,l + add hl, de + ld d, h + ld e, l - ; get bank of predef routine - ld a,[de] - ld [wPredefBank],a + ; get bank of predef routine + ld a, [de] + ld [wPredefBank], a - ; get pointer + ; get pointer inc de - ld a,[de] - ld l,a + ld a, [de] + ld l, a inc de - ld a,[de] - ld h,a + ld a, [de] + ld h, a ret @@ -144,10 +144,12 @@ PredefPointers:: ; f681d (3d:681d) add_predef DoInGameTradeDialogue ; 54 initiate trade (1c:5b86) add_predef HallOfFamePC add_predef DisplayDexRating + predef_const _LeaveMapAnim predef_const EnterMapAnim dbw $1E, _LeaveMapAnim ; wrong bank dbw $1E, EnterMapAnim ; wrong bank + add_predef GetTileTwoStepsInFrontOfPlayer add_predef CheckForCollisionWhenPushingBoulder add_predef PrintStrengthTxt diff --git a/scripts/silphco11_2.asm b/scripts/silphco11_2.asm index e7b59757..22e19a02 100755 --- a/scripts/silphco11_2.asm +++ b/scripts/silphco11_2.asm @@ -71,6 +71,6 @@ MissableObjects_f25ce db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 db HS_SILPH_CO_11F_2 - db HS_SILPH_CO_11F_3 - db HS_MAP_F4_1 + db HS_SILPH_CO_11F_JESSIE + db HS_SILPH_CO_11F_JAMES db $ff \ No newline at end of file -- cgit v1.3.1-sl0p