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 --- constants/hide_show_constants.asm | 4 +- constants/predef_constants.asm | 101 -------------------------------------- 2 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 constants/predef_constants.asm (limited to 'constants') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index f41477a5..4297bc2e 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -224,9 +224,9 @@ const_value SET $8d 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 HS_CHAMPIONS_ROOM_OAK ; DA -const_value SET $df +const_value SET $de + const HS_CHAMPIONS_ROOM_OAK ; DE const HS_SEAFOAM_ISLANDS_1_BOULDER_1 ; DF const HS_SEAFOAM_ISLANDS_1_BOULDER_2 ; E0 const HS_SEAFOAM_ISLANDS_2_BOULDER_1 ; E1 diff --git a/constants/predef_constants.asm b/constants/predef_constants.asm deleted file mode 100644 index 76ff24a9..00000000 --- a/constants/predef_constants.asm +++ /dev/null @@ -1,101 +0,0 @@ -const_value = 0 - - predef_const DrawPlayerHUDAndHPBar - predef_const CopyUncompressedPicToTilemap - predef_const AnimateSendingOutMon - predef_const ScaleSpriteByTwo - predef_const LoadMonBackPic - predef_const CopyDownscaledMonTiles - predef_const LoadMissableObjects - predef_const HealParty - predef_const MoveAnimation; 08 play move animation - predef_const DivideBCDPredef - predef_const DivideBCDPredef2 - predef_const AddBCDPredef - predef_const SubBCDPredef - predef_const DivideBCDPredef3 - predef_const DivideBCDPredef4 - predef_const InitPlayerData - predef_const FlagActionPredef ; 10 - predef_const HideObject ; 11 - predef_const IsObjectHidden - predef_const ApplyOutOfBattlePoisonDamage - predef_const AnyPartyAlive - predef_const ShowObject - predef_const ShowObject2 - predef_const ReplaceTileBlock - predef_const InitPlayerData2 ; 18 - predef_const LoadTilesetHeader - predef_const LearnMoveFromLevelUp - predef_const LearnMove - predef_const GetQuantityOfItemInBag - predef_const CheckForHiddenObjectOrBookshelfOrCardKeyDoor ; for these two, the bank number is actually 0 - predef_const GiveItem - predef_const InvertBGPal_4Frames - predef_const FindPathToPlayer - predef_const PredefShakeScreenVertically - predef_const CalcPositionOfPlayerRelativeToNPC - predef_const ConvertNPCMovementDirectionsToJoypadMasks - predef_const PredefShakeScreenHorizontally - predef_const UpdateHPBar - predef_const HPBarLength - predef_const Diploma_TextBoxBorder - predef_const DoubleOrHalveSelectedStats - predef_const ShowPokedexMenu - predef_const EvolutionAfterBattle - predef_const SaveSAVtoSRAM0 - predef_const InitOpponent - predef_const CableClub_Run - predef_const DrawBadges - predef_const ExternalClockTradeAnim - predef_const BattleTransition - predef_const CopyTileIDsFromList - predef_const PlayIntro - predef_const Func_79869 - predef_const FlashScreen - predef_const GetTileAndCoordsInFrontOfPlayer - predef_const StatusScreen - predef_const StatusScreen2 - predef_const InternalClockTradeAnim - predef_const TrainerEngage - predef_const IndexToPokedex - predef_const DisplayPicCenteredOrUpperRight; 3B display pic? - predef_const UsedCut - predef_const ShowPokedexData - predef_const WriteMonMoves - predef_const SaveSAV - predef_const LoadSGB - predef_const MarkTownVisitedAndLoadMissableObjects - predef_const SetPartyMonTypes - predef_const CanLearnTM - predef_const TMToMove - predef_const _RunPaletteCommand - predef_const StarterDex ; 46 - predef_const _AddPartyMon - predef_const UpdateHPBar2 - predef_const DrawEnemyHUDAndHPBar - predef_const LoadTownMap_Nest - predef_const PrintMonType - predef_const EmotionBubble; 4C player exclamation - predef_const EmptyFunc3; return immediately - predef_const AskName - predef_const PewterGuys - predef_const SaveSAVtoSRAM2 - predef_const LoadSAVCheckSum2 - predef_const LoadSAV - predef_const SaveSAVtoSRAM1 - predef_const DoInGameTradeDialogue ; 54 initiate trade - predef_const HallOfFamePC - predef_const DisplayDexRating - predef_const _LeaveMapAnim ; wrong bank - predef_const EnterMapAnim ; wrong bank - predef_const GetTileTwoStepsInFrontOfPlayer - predef_const CheckForCollisionWhenPushingBoulder - predef_const PrintStrengthTxt - predef_const PickUpItem - predef_const PrintMoveType - predef_const LoadMovePPs - predef_const DrawHP ; 5F - predef_const DrawHP2 - predef_const Func_1c9c6 - predef_const 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 'constants') 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 From 6006a9df06cbe4228987a791aa522c01b1c49ddd Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Tue, 31 May 2016 22:41:22 -0400 Subject: Game Corner --- constants/misc_constants.asm | 3 ++- data/mapObjects/celadongamecorner.asm | 4 ++-- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- engine/bank3c.asm | 17 ++++++++++++++++- main.asm | 8 +++++++- maps/celadongamecorner.blk | 2 +- scripts/celadongamecorner.asm | 23 +++++++++++++---------- 8 files changed, 43 insertions(+), 18 deletions(-) (limited to 'constants') diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 8333837d..4538c353 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -179,10 +179,11 @@ TEXT_REPEL_WORE_OFF EQU $d2 TEXT_SAFARI_GAME_OVER EQU $d3 ; PrintNumber - +BIT_MONEY_SIGN EQU 5 BIT_LEFT_ALIGN EQU 6 BIT_LEADING_ZEROES EQU 7 +MONEY_SIGH EQU (1 << BIT_MONEY_SIGN) LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) diff --git a/data/mapObjects/celadongamecorner.asm b/data/mapObjects/celadongamecorner.asm index 1169e1da..a44cf0a6 100755 --- a/data/mapObjects/celadongamecorner.asm +++ b/data/mapObjects/celadongamecorner.asm @@ -18,8 +18,8 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99) object SPRITE_MOM_GEISHA, $8, $b, STAY, LEFT, $6 ; person object SPRITE_GYM_HELPER, $8, $e, STAY, LEFT, $7 ; person object SPRITE_GAMBLER, $b, $f, STAY, RIGHT, $8 ; person - object SPRITE_MART_GUY, $e, $b, STAY, LEFT, $9 ; person - object SPRITE_GENTLEMAN, $11, $d, STAY, RIGHT, $a ; person + object SPRITE_FAT_BALD_GUY, $e, $b, STAY, LEFT, $9 ; person + object SPRITE_FISHER, $11, $d, STAY, RIGHT, $a ; person object SPRITE_ROCKET, $9, $5, STAY, UP, $b, OPP_ROCKET, $7 ; warp-to diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 11d2a28b..87388feb 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -135,7 +135,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonMansion5_h) db BANK(CeladonPokecenter_h) db BANK(CeladonGym_h) - db $12 ; db BANK(CeladonGameCorner_h) + db BANK(CeladonGameCorner_h) db $12 ; db BANK(CeladonMart5_h) db $12 ; db BANK(CeladonPrizeRoom_h) db $12 ; db BANK(CeladonDiner_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index bacc67e3..75f8b555 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -135,7 +135,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonMansion5_h dw CeladonPokecenter_h dw CeladonGym_h - dw $4bc8 ; dw CeladonGameCorner_h + dw CeladonGameCorner_h dw $507f ; dw CeladonMart5_h dw $5107 ; dw CeladonPrizeRoom_h dw $5168 ; dw CeladonDiner_h diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 852af176..2e0a8ee2 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -370,7 +370,22 @@ PikachuMovementData_f1e2b: INCLUDE "scripts/celadonmart3_2.asm" INCLUDE "scripts/celadonmansion1_2.asm" INCLUDE "scripts/celadonmansion3_2.asm" - dr $f1f23, $f218c + +Func_f1f23: + ld hl, PikachuMovementData_f1f2c + ld b, SPRITE_FACING_DOWN + call Func_f0a82 + ret + +PikachuMovementData_f1f2c: + db $00 + db $20 + db $1e + db $35 + db $3f + +Func_f1f31: + dr $f1f31, $f218c INCLUDE "scripts/mtmoonpokecenter2.asm" diff --git a/main.asm b/main.asm index cecff2eb..cdf6edaa 100755 --- a/main.asm +++ b/main.asm @@ -943,7 +943,13 @@ INCLUDE "scripts/celadongym.asm" INCLUDE "data/mapObjects/celadongym.asm" CeladonGymBlocks: INCBIN "maps/celadongym.blk" - dr $48bc8,$492a9 + +INCLUDE "data/mapHeaders/celadongamecorner.asm" +INCLUDE "scripts/celadongamecorner.asm" +INCLUDE "data/mapObjects/celadongamecorner.asm" +CeladonGameCornerBlocks: +INCBIN "maps/celadongamecorner.blk" + dr $4907f,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/maps/celadongamecorner.blk b/maps/celadongamecorner.blk index 82fd0b61..8c8b1fd8 100644 --- a/maps/celadongamecorner.blk +++ b/maps/celadongamecorner.blk @@ -2,4 +2,4 @@ -4***C*///3 : : : :9!9!9!99!9!9!98!8!8!8 () \ No newline at end of file +4***C*///3 : : : :9!9!9!99!9!9!98!8!8!8 () \ No newline at end of file diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 5fc9cf97..9af229c6 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -71,8 +71,12 @@ CeladonGameCornerScript1: ; 48c19 (12:4c19) .asm_48c43 ld a, [wXCoord] cp $8 - jr nz, .asm_48c4d + jr nz, .pikachu ld de, MovementData_48c63 + jr .asm_48c4d +.pikachu + callab Func_f1f23 + ld de, MovementData_48c5a .asm_48c4d ld a, $b ld [H_SPRITEINDEX], a @@ -85,8 +89,8 @@ MovementData_48c5a: ; 48c5a (12:4c5a) db NPC_MOVEMENT_DOWN db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT - db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT + db NPC_MOVEMENT_UP db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT db NPC_MOVEMENT_RIGHT @@ -144,7 +148,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9) ld a, [wCurrentMenuItem] and a jr nz, .asm_48d0f - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48d19 call Has9990Coins @@ -267,7 +271,8 @@ CeladonGameCornerText_48d9c: ; 48d9c (12:4d9c) Received10CoinsText: ; 48da1 (12:4da1) TX_FAR _Received10CoinsText - db $0B, "@" + TX_SFX_ITEM + db "@" CeladonGameCornerText_48da7: ; 48da7 (12:4da7) TX_FAR _CeladonGameCornerText_48da7 @@ -360,7 +365,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b) jr nz, .asm_48e75 ld hl, CeladonGameCornerText_48e88 call PrintText - ld b,COIN_CASE + ld b, COIN_CASE call IsItemInBag jr z, .asm_48e7f call Has9990Coins @@ -472,13 +477,11 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) ld hl, wd730 set 6, [hl] coord hl, 11, 0 - ld b, $5 - ld c, $7 + lb bc, 5, 7 call TextBoxBorder call UpdateSprites coord hl, 12, 1 - ld b, 4 - ld c, 7 + lb bc, 4, 7 call ClearScreenArea coord hl, 12, 2 ld de, GameCornerMoneyText @@ -488,7 +491,7 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, $a3 + ld c, 3 | MONEY_SIGH | LEADING_ZEROES call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText -- cgit v1.3.1-sl0p From 4b91cc770e8fc83353f962a4a6f9ebef6eb952c8 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Wed, 1 Jun 2016 09:44:32 -0400 Subject: Text macros; Prize Room --- charmap.asm | 4 +- constants.asm | 3 +- constants/misc_constants.asm | 15 -- constants/text_constants.asm | 15 ++ home.asm | 160 ++++++++++----------- macros.asm | 6 +- main.asm | 8 +- scripts/celadongamecorner.asm | 2 +- scripts/celadonmartroof.asm | 2 +- scripts/viridianmart.asm | 2 +- text.asm | 328 +++++++++++++++++++++--------------------- text/maps/hall_of_fame.asm | 6 +- 12 files changed, 282 insertions(+), 269 deletions(-) create mode 100755 constants/text_constants.asm (limited to 'constants') diff --git a/charmap.asm b/charmap.asm index e4368d40..8f57a130 100644 --- a/charmap.asm +++ b/charmap.asm @@ -147,12 +147,14 @@ charmap "ゅ", $E1 charmap "ょ", $E2 charmap "ー", $E3 -charmap "", $4a ; PkMn +charmap "", $4A ; PkMn charmap "@", $50 charmap "", $52 charmap "", $53 charmap "#", $54 ;charmap "POKé", $54 +charmap "", $59 +charmap "", $5A charmap "′", $71 charmap "″", $73 charmap "…", $75 diff --git a/constants.asm b/constants.asm index b4e27a91..554f89ca 100644 --- a/constants.asm +++ b/constants.asm @@ -29,4 +29,5 @@ INCLUDE "constants/tilesets.asm" INCLUDE "constants/starter_mons.asm" INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_macros.asm" -INCLUDE "constants/pikachu_emotion_constants.asm" \ No newline at end of file +INCLUDE "constants/pikachu_emotion_constants.asm" +INCLUDE "constants/text_constants.asm" diff --git a/constants/misc_constants.asm b/constants/misc_constants.asm index 4538c353..e5d27d1b 100644 --- a/constants/misc_constants.asm +++ b/constants/misc_constants.asm @@ -172,21 +172,6 @@ FLAG_RESET EQU 0 FLAG_SET EQU 1 FLAG_TEST EQU 2 -; special text IDs -TEXT_MON_FAINTED EQU $d0 -TEXT_BLACKED_OUT EQU $d1 -TEXT_REPEL_WORE_OFF EQU $d2 -TEXT_SAFARI_GAME_OVER EQU $d3 - -; PrintNumber -BIT_MONEY_SIGN EQU 5 -BIT_LEFT_ALIGN EQU 6 -BIT_LEADING_ZEROES EQU 7 - -MONEY_SIGH EQU (1 << BIT_MONEY_SIGN) -LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) -LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) - ; HP bar HP_BAR_GREEN EQU 0 HP_BAR_YELLOW EQU 1 diff --git a/constants/text_constants.asm b/constants/text_constants.asm new file mode 100755 index 00000000..4479e90e --- /dev/null +++ b/constants/text_constants.asm @@ -0,0 +1,15 @@ +; special text IDs +TEXT_MON_FAINTED EQU $d0 +TEXT_BLACKED_OUT EQU $d1 +TEXT_REPEL_WORE_OFF EQU $d2 +TEXT_SAFARI_GAME_OVER EQU $d3 +TEXT_PIKACHU_ANIM EQU $d4 + +; PrintNumber +BIT_MONEY_SIGN EQU 5 +BIT_LEFT_ALIGN EQU 6 +BIT_LEADING_ZEROES EQU 7 + +MONEY_SIGN EQU (1 << BIT_MONEY_SIGN) +LEFT_ALIGN EQU (1 << BIT_LEFT_ALIGN) +LEADING_ZEROES EQU (1 << BIT_LEADING_ZEROES) diff --git a/home.asm b/home.asm index 11a0dcc0..426812e4 100644 --- a/home.asm +++ b/home.asm @@ -117,12 +117,12 @@ PlayPikachuPCM:: ; 0150 (0:0150) .playSingleSample dec a jr nz, .playSingleSample - + rept 7 call LoadNextSoundClipSample call PlaySoundClipSample endr - + call LoadNextSoundClipSample dec bc ld a, c @@ -140,7 +140,7 @@ LoadNextSoundClipSample:: ; 0199 (0:0199) ld [rNR32], a sla d ret - + PlaySoundClipSample:: ; 01a5 (0:01a5) ld a, $3 .loop @@ -164,7 +164,7 @@ Joypad:: ; 01b9 (0:01b9) ReadJoypad:: ; 01c8 (0:01c8) homecall_jump ReadJoypad_ - + INCLUDE "home/overworld.asm" CheckForUserInterruption:: ; 10ba (0:10ba) @@ -391,8 +391,8 @@ GetCryData:: ; 11a5 (0:11a5) ld [wTempoModifier], a call BankswitchBack - ; Cry headers have 3 channels, - ; and start from index $14, + ; Cry headers have 3 channels, + ; and start from index $14, ; so add 3 times the cry id. ld a, b ld c, $14 @@ -411,7 +411,7 @@ DisplayPartyMenu:: ; 11c8 (0:11c8) call PartyMenuInit call DrawPartyMenu jp HandlePartyMenuInput - + GoBackToPartyMenu:: ; 11dd (0:11dd) ld a, [hTilesetType] push af @@ -538,13 +538,13 @@ HandlePartyMenuInput:: ; 1226 (0:1226) PartyMenuText_12cc:: ; 12cc (0:12cc) TX_FAR _SleepingPikachuText1 ; 28:411b db "@" - + DrawPartyMenu:: ; 12d1 (0:12d1) ld hl, DrawPartyMenu_ ; 4:5875 jr DrawPartyMenuCommon RedrawPartyMenu:: ; 12d6 (0:12d6) - ld hl, RedrawPartyMenu_ ; 4:5886 + ld hl, RedrawPartyMenu_ ; 4:5886 DrawPartyMenuCommon:: ; 12d9 (0:12d9) ld b, BANK(RedrawPartyMenu_) @@ -586,7 +586,7 @@ PrintLevel:: ; 1303 (0:1303) ld [hli], a ld c, 2 ; number of digits ld a, [wLoadedMonLevel] ; level - cp a, 100 + cp 100 jr c, PrintLevelCommon ; if level at least 100, write over the ":L" tile dec hl @@ -634,16 +634,16 @@ GetMonHeader:: ; 132f (0:132f) ld [wd11e], a ld de, FossilKabutopsPic ld b, $66 ; size of Kabutops fossil and Ghost sprites - cp a, FOSSIL_KABUTOPS ; Kabutops fossil + cp FOSSIL_KABUTOPS ; Kabutops fossil jr z, .specialID ld de, GhostPic - cp a, MON_GHOST ; Ghost + cp MON_GHOST ; Ghost jr z, .specialID ld de, FossilAerodactylPic ld b, $77 ; size of Aerodactyl fossil sprite - cp a, FOSSIL_AERODACTYL ; Aerodactyl fossil + cp FOSSIL_AERODACTYL ; Aerodactyl fossil jr z, .specialID - ;cp a, MEW + ;cp MEW ;jr z, .mew predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number ld a, [wd11e] @@ -760,7 +760,7 @@ PrintBCDDigit:: ; 13e4 (0:13e4) .skipCurrencySymbol res 7, b ; unset 7 to indicate that a nonzero digit has been reached .outputDigit - add a, "0" + add "0" ld [hli], a jp PrintLetterDelay .zeroDigit @@ -1065,7 +1065,7 @@ ResetPlayerSpriteData_ClearSpriteData:: ; 27ba (0:27ba) ld bc, $10 xor a call FillMemory ; XXX why replaced with call + ret? - ret + ret ;jp FillMemory FadeOutAudio:: ; 27c2 (0:27c2) @@ -1143,15 +1143,15 @@ DisplayTextID:: ; 2817 (0:2817) ld [wSpriteIndex], a and a jp z, DisplayStartMenu - cp a, $d4 ; new yellow asm + cp TEXT_PIKACHU_ANIM ; new yellow asm jp z, DisplayUnknownText_29c6 - cp a, TEXT_SAFARI_GAME_OVER + cp TEXT_SAFARI_GAME_OVER jp z, DisplaySafariGameOverText - cp a, TEXT_MON_FAINTED + cp TEXT_MON_FAINTED jp z, DisplayPokemonFaintedText - cp a, TEXT_BLACKED_OUT + cp TEXT_BLACKED_OUT jp z, DisplayPlayerBlackedOutText - cp a, TEXT_REPEL_WORE_OFF + cp TEXT_REPEL_WORE_OFF jp z, DisplayRepelWoreOffText ld a, [wNumSprites] ld e, a @@ -1189,24 +1189,24 @@ DisplayTextID:: ; 2817 (0:2817) ld l, a ; hl = address of the text ld a, [hl] ; a = first byte of text ; check first byte of text for special cases - cp a, $fe ; Pokemart NPC + cp $fe ; Pokemart NPC jp z, DisplayPokemartDialogue - cp a, $ff ; Pokemon Center NPC + cp $ff ; Pokemon Center NPC jp z, DisplayPokemonCenterDialogue - cp a, $fc ; Item Storage PC + cp $fc ; Item Storage PC jp z, FuncTX_ItemStoragePC - cp a, $fd ; Bill's PC + cp $fd ; Bill's PC jp z, FuncTX_BillsPC - cp a, $f9 ; Pokemon Center PC + cp $f9 ; Pokemon Center PC jp z, FuncTX_PokemonCenterPC - cp a, $f5 ; Vending Machine + cp $f5 ; Vending Machine jr nz, .notVendingMachine callba VendingMachineMenu ; jump banks to vending machine routine jr AfterDisplayingTextID .notVendingMachine - cp a, $f7 ; slot machine - jp z, FuncTX_SlotMachine - cp a, $f6 ; cable connection NPC in Pokemon Center + cp $f7 ; slot machine + jp z, FuncTX_GameCornerPrizeMenu + cp $f6 ; cable connection NPC in Pokemon Center jr nz, .notSpecialCase callab CableClubNPC jr AfterDisplayingTextID @@ -1289,7 +1289,7 @@ LoadItemList:: ; 293d (0:293d) ld a, [hli] ld [de], a inc de - cp a, $ff + cp $ff jr nz, .loop ret @@ -1352,7 +1352,7 @@ RepelWoreOffText:: ; 29c1 (0:29c1) DisplayUnknownText_29c6:: ; 29c6 (0:29c6) callab Func_fd004 ; 3f:5004 jp CloseTextDisplay - + INCLUDE "engine/menu/start_menu.asm" ; function to count how many bits are set in a string of bytes @@ -1462,7 +1462,7 @@ DisplayListMenuID:: ; 2ae0 (0:2ae0) ld a, 1 ; max menu item ID is 1 if the list has less than 2 entries ld [wMenuWatchMovingOutOfBounds], a ld a, [wListCount] - cp a, 2 ; does the list have less than 2 entries? + cp 2 ; does the list have less than 2 entries? jr c, .setMenuVariables ld a, 2 ; max menu item ID is 2 if the list has at least 2 entries .setMenuVariables @@ -1532,7 +1532,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) ld a, c ld [wWhichPokemon], a ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .skipMultiplying ; if it's an item menu sla c ; item entries are 2 bytes long, so multiply by 2 @@ -1553,7 +1553,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) call GetItemPrice pop hl ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .skipGettingQuantity ; if it's an item menu inc hl @@ -1599,7 +1599,7 @@ DisplayListMenuIDLoop:: ; 2b4d (0:2b4d) jr z, .upPressed .downPressed ld a, [hl] - add a, 3 + add 3 ld b, a ld a, [wListCount] cp b ; will going down scroll past the Cancel button? @@ -1618,7 +1618,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) coord hl, 15, 9 lb bc, 1, 3 ; height and width ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .drawTextBox ; text box dimensions/coordinates for quantity and price coord hl, 7, 9 @@ -1627,7 +1627,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) call TextBoxBorder coord hl, 16, 10 ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .printInitialQuantity coord hl, 8, 10 .printInitialQuantity @@ -1671,7 +1671,7 @@ DisplayChooseQuantityMenu:: ; 2c51 (0:2c51) .handleNewQuantity coord hl, 17, 10 ld a, [wListMenuID] - cp a, PRICEDITEMLISTMENU + cp PRICEDITEMLISTMENU jr nz, .printQuantity .printPrice ld c, $03 @@ -1764,7 +1764,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld a, [wListScrollOffset] ld c, a ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU ld a, c jr nz, .skipMultiplying ; if it's an item menu @@ -1784,7 +1784,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld [wWhichPokemon], a ld a, [de] ld [wd11e], a - cp a, $ff + cp $ff jp z, .printCancelMenuItem push bc push de @@ -1794,7 +1794,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) ld a, [wListMenuID] and a jr z, .pokemonPCMenu - cp a, $01 + cp $01 jr z, .movesMenu .itemMenu call GetItemName @@ -1882,7 +1882,7 @@ PrintListMenuEntries:: ; 2d52 (0:2d52) pop de inc de ld a, [wListMenuID] - cp a, ITEMLISTMENU + cp ITEMLISTMENU jr nz, .nextListEntry .printItemQuantity ld a, [wd11e] @@ -2054,9 +2054,9 @@ HiddenPrefix:: ; 2f33 (0:2f33) ; sets carry if item is HM, clears carry if item is not HM ; Input: a = item ID IsItemHM:: ; 2f35 (0:2f35) - cp a, HM_01 + cp HM_01 jr c, .notHM - cp a, TM_01 + cp TM_01 ret .notHM and a @@ -2123,7 +2123,7 @@ ChooseFlyDestination:: ; 2f9a (0:2f9a) Func_2fa7:: ; 2fa7 (0:2fa7) homecall Func_e8a5e ret - + SerialFunction:: ; 2fb7 (0:2fb7) ld a, [wUnknownSerialFlag_d49a] bit 0, a @@ -2147,7 +2147,7 @@ SerialFunction:: ; 2fb7 (0:2fb7) ld a, START_TRANSFER_INTERNAL_CLOCK ld [rSC], a ret - + ; causes the text box to close without waiting for a button press after displaying text DisableWaitingAfterTextDisplay:: ; 2fde (0:2fde) ld a, $01 @@ -2208,7 +2208,7 @@ IsKeyItem:: ; 3000 (0:3000) ; INPUT: ; [wTextBoxID] = text box ID DisplayTextBoxID:: ; 3010 (0:3010) - homecall_sf DisplayTextBoxID_ + homecall_sf DisplayTextBoxID_ ret UpdateGBCPal_BGP:: ; 3021 (0:3021) @@ -2232,7 +2232,7 @@ UpdateGBCPal_BGP:: ; 3021 (0:3021) .notGBC pop af ret - + UpdateGBCPal_OBP0:: ; 3040 (0:3040) push af ld a, [hGBC] @@ -2257,7 +2257,7 @@ UpdateGBCPal_OBP0:: ; 3040 (0:3040) .notGBC pop af ret - + UpdateGBCPal_OBP1:: ; 3061 (0:3061) push af ld a, [hGBC] @@ -2282,7 +2282,7 @@ UpdateGBCPal_OBP1:: ; 3061 (0:3061) .notGBC pop af ret - + Func_3082:: ; 3082 (0:3082) ld a, [H_LOADEDROMBANK] push af @@ -2332,7 +2332,7 @@ RunNPCMovementScript:: ; 30ae (0:30ae) pop af call BankswitchCommon ret - + .NPCMovementScriptPointerTables dw PalletMovementScriptPointerTable dw PewterMuseumGuyMovementScriptPointerTable @@ -2811,7 +2811,7 @@ FuncTX_BillsPC:: ; 33f9 (0:33f9) ld hl, BillsPC_ jr bankswitchAndContinue -FuncTX_SlotMachine:: ; 3403 (0:3403) +FuncTX_GameCornerPrizeMenu:: ; 3403 (0:3403) ; XXX find a better name for this function ; special_F7 ld b, BANK(CeladonPrizeMenu) @@ -2842,7 +2842,7 @@ IsItemInBag:: ; 3422 (0:3422) ld a, b and a ret - + IsSurfingPikachuInParty:: ; 342a (0:342a) ; set bit 6 of wd472 if true ; also calls Func_3467, which is a bankswitch to IsStarterPikachuInOurParty @@ -2884,7 +2884,7 @@ IsSurfingPikachuInParty:: ; 342a (0:342a) jr nz, .loop call Func_3467 ret - + Func_3467:: ; 3467 (0:3467) push hl push bc @@ -2896,7 +2896,7 @@ Func_3467:: ; 3467 (0:3467) set 7, a ld [wd472], a ret - + DisplayPokedex:: ; 347d (0:347d) ld [wd11e], a jpba _DisplayPokedex @@ -2939,7 +2939,7 @@ SpriteFunc_34a1:: ; 34a1 (0:34a1) dec h ld [hl], c ret - + ; tests if the player's coordinates are in a specified array ; INPUT: ; hl = address of array @@ -2958,7 +2958,7 @@ CheckCoords:: ; 34c4 (0:34c4) ld [wCoordIndex], a .loop ld a, [hli] - cp a, $ff ; reached terminator? + cp $ff ; reached terminator? jr z, .notInArray push hl ld hl, wCoordIndex @@ -3077,7 +3077,7 @@ GetSpriteMovementByte1Pointer:: ; 354b (0:354b) ld h, $C2 ld a, [H_SPRITEINDEX] swap a - add a, 6 + add 6 ld l, a ret @@ -3145,7 +3145,7 @@ IsFightingJessieJames:: ; 359e (0:359e) ld [hli], a ld [hl], d ret - + GetTrainerName:: ; 35bb (0:35bb) jpba GetTrainerName_ @@ -3249,7 +3249,7 @@ MoveSprite_:: ; 3640 (0:3640) ld [hli], a inc de inc c - cp a, $FF ; have we reached the end of the movement data? + cp $FF ; have we reached the end of the movement data? jr nz, .loop ld a, c @@ -3265,7 +3265,7 @@ MoveSprite_:: ; 3640 (0:3640) dec a ld [wJoyIgnore], a ld [wWastedByteCD3A], a - ret + ret ; divides [hDividend2] by [hDivisor2] and stores the quotient in [hQuotient2] DivideBytes:: ; 366e (0:366e) @@ -3485,7 +3485,7 @@ GetName:: ; 3762 (0:3762) ld e, l .nextChar ld a, [hli] - cp a, "@" + cp "@" jr nz, .nextChar inc c ;entry counter ld a, b ;wanted entry @@ -3571,9 +3571,9 @@ CopyString:: ; 3816 (0:3816) ; Just copies [hJoyPressed] to [hJoy5]. ; 2. Get currently pressed buttons at low sample rate with delay ; ([hJoy7] == 1, [hJoy6] != 0) -; If the user holds down buttons for more than half a second, +; If the user holds down buttons for more than half a second, ; report buttons as being pressed up to 12 times per second thereafter. -; If the user holds down buttons for less than half a second, +; If the user holds down buttons for less than half a second, ; report only one button press. ; 3. Same as 2, but report no buttons as pressed if A or B is held down. ; ([hJoy7] == 1, [hJoy6] == 0) @@ -3634,7 +3634,7 @@ WaitForTextScrollButtonPress:: ; 3852 (0:3852) push bc callab TownMapSpriteBlinkingAnimation ; 1c:5753 pop bc - pop de + pop de .skipAnimation coord hl, 18, 16 call HandleDownArrowBlinkTiming @@ -3744,7 +3744,7 @@ PrintLetterDelay:: ; 38c8 (0:38c8) ret ; Copies [hl, bc) to [de, bc - hl). -; In other words, the source data is from hl up to but not including bc, +; In other words, the source data is from hl up to but not including bc, ; and the destination is de. CopyDataUntil:: ; 3908 (0:3908) ld a, [hli] @@ -4207,7 +4207,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) jr nz, .oldMenuItemLoop .checkForArrow1 ld a, [hl] - cp a, "▶" ; was an arrow next to the previously selected menu item? + cp "▶" ; was an arrow next to the previously selected menu item? jr nz, .skipClearingArrow .clearArrow ld a, [wTileBehindCursor] @@ -4231,7 +4231,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) jr nz, .currentMenuItemLoop .checkForArrow2 ld a, [hl] - cp a, "▶" ; has the right arrow already been placed? + cp "▶" ; has the right arrow already been placed? jr z, .skipSavingTile ; if so, don't lose the saved tile ld [wTileBehindCursor], a ; save tile before overwriting with right arrow .skipSavingTile @@ -4247,7 +4247,7 @@ PlaceMenuCursor:: ; 3b6d (0:3b6d) ; This is used to mark a menu cursor other than the one currently being ; manipulated. In the case of submenus, this is used to show the location of -; the menu cursor in the parent menu. In the case of swapping items in list, +; the menu cursor in the parent menu. In the case of swapping items in list, ; this is used to mark the item that was first chosen to be swapped. PlaceUnfilledArrowMenuCursor:: ; 3bd9 (0:3bd9) ld b, a @@ -4271,7 +4271,7 @@ EraseMenuCursor:: ; 3be6 (0:3be6) ; This toggles a blinking down arrow at hl on and off after a delay has passed. ; This is often called even when no blinking is occurring. ; The reason is that most functions that call this initialize H_DOWNARROWBLINKCNT1 to 0. -; The effect is that if the tile at hl is initialized with a down arrow, +; The effect is that if the tile at hl is initialized with a down arrow, ; this function will toggle that down arrow on and off, but if the tile isn't ; initliazed with a down arrow, this function does nothing. ; That allows this to be called without worrying about if a down arrow should @@ -4291,7 +4291,7 @@ HandleDownArrowBlinkTiming:: ; 3bf1 (0:3bf1) dec a ld [H_DOWNARROWBLINKCNT2], a ret nz - ld a, " " + ld a, " " ld [hl], a ld a, $ff ld [H_DOWNARROWBLINKCNT1], a @@ -4357,7 +4357,7 @@ FarPrintText:: ; 3c4c (0:3c4c) pop af call BankswitchCommon ret - + PrintNumber:: ; 3c5b (0:3c5b) ; Print the c-digit, b-byte value at de. ; Allows 2 to 7 digits. For 1-digit numbers, add @@ -4562,7 +4562,7 @@ endm ret .NextDigit: ; 3d85 (0:3d85) -; Increment unless the number is left-aligned, +; Increment unless the number is left-aligned, ; leading zeroes are not printed, and no digits ; have been printed yet. bit BIT_LEADING_ZEROES, d @@ -4717,7 +4717,7 @@ ReloadMapSpriteTilePatterns:: ; 3e1e (0:3e1e) GiveItem:: ; 3e3f (0:3e3f) -; Give player quantity c of item b, +; Give player quantity c of item b, ; and copy the item's name to wcf4b. ; Return carry on success. ld a, b @@ -4760,7 +4760,7 @@ BankswitchCommon:: ; 3e7e (0:3e7e) ld [H_LOADEDROMBANK], a ld [MBC1RomBank], a ret - + Bankswitch:: ; 3e84 (0:3e84) ; self-contained bankswitch, use this when not in the home bank ; switches to the bank in b @@ -4787,7 +4787,7 @@ SwitchSRAMBankAndLatchClockData:: ; 3e99 (0:3e99) pop af ld [MBC1SRamBank], a ret - + PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) push af ld a, $0 @@ -4795,7 +4795,7 @@ PrepareRTCDataAndDisableSRAM:: ; 3ea9 (0:3ea9) ld [MBC1SRamEnable], a pop af ret - + INCLUDE "home/predef.asm" UpdateCinnabarGymGateTileBlocks:: ; 3ef0 (0:3ef0) @@ -4863,8 +4863,8 @@ SetMapTextPointer:: ; 3f54 (0:3f54) ret TextPredefs:: ; 3f67 (0:3f67) -const_value = 1 - +const_value = 1 + add_tx_pre CardKeySuccessText ; 01 add_tx_pre CardKeyFailText ; 02 add_tx_pre RedBedroomPCText ; 03 diff --git a/macros.asm b/macros.asm index cdc7ceb3..6e1ebc9d 100644 --- a/macros.asm +++ b/macros.asm @@ -350,9 +350,13 @@ TX_FAR: MACRO dab \1 ENDM - +TX_VENDING_MACHINE EQUS "db $f5" TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_PC EQUS "db $f9" +TX_PLAYERS_PC EQUS "db $fc" +TX_BILLS_PC EQUS "db $fd" +TX_POKEMART_CLERK EQUS "db $fe" TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. diff --git a/main.asm b/main.asm index 12e689c1..cd6b79cb 100755 --- a/main.asm +++ b/main.asm @@ -955,7 +955,13 @@ INCLUDE "scripts/celadonmart5.asm" INCLUDE "data/mapObjects/celadonmart5.asm" CeladonMart5Blocks: INCBIN "maps/celadonmart5.blk" - dr $49107,$492a9 + +INCLUDE "data/mapHeaders/celadonprizeroom.asm" +INCLUDE "scripts/celadonprizeroom.asm" +INCLUDE "data/mapObjects/celadonprizeroom.asm" +CeladonPrizeRoomBlocks: +INCBIN "maps/celadonprizeroom.blk" + dr $49168,$492a9 INCLUDE "data/mapHeaders/mtmoonpokecenter.asm" INCLUDE "scripts/mtmoonpokecenter.asm" diff --git a/scripts/celadongamecorner.asm b/scripts/celadongamecorner.asm index 9af229c6..0013be1b 100755 --- a/scripts/celadongamecorner.asm +++ b/scripts/celadongamecorner.asm @@ -491,7 +491,7 @@ CeladonGameCornerScript_48f1e: ; 48f1e (12:4f1e) call PlaceString coord hl, 12, 3 ld de, wPlayerMoney - ld c, 3 | MONEY_SIGH | LEADING_ZEROES + ld c, 3 | MONEY_SIGN | LEADING_ZEROES call PrintBCDNumber coord hl, 12, 4 ld de, GameCornerCoinText diff --git a/scripts/celadonmartroof.asm b/scripts/celadonmartroof.asm index b129753d..4d819be7 100755 --- a/scripts/celadonmartroof.asm +++ b/scripts/celadonmartroof.asm @@ -252,7 +252,7 @@ CeladonMartRoofText4: ; 4859d (12:459d) db "@" CeladonMartRoofText5: ; 485a2 (12:45a2) - db $f5 + TX_VENDING_MACHINE CeladonMartRoofText6: ; 485a3 (12:45a3) TX_FAR _CeladonMartRoofText6 diff --git a/scripts/viridianmart.asm b/scripts/viridianmart.asm index 05e566fb..b69e24c2 100755 --- a/scripts/viridianmart.asm +++ b/scripts/viridianmart.asm @@ -93,7 +93,7 @@ ViridianMartText4: ; 1d4f5 (7:54f5) ViridianMartText5: ; 1d4fa (7:54fa) TX_FAR ViridianMartParcelQuestText - db $11 + TX_SFX_KEY_ITEM db "@" ViridianMartText2: ; 1d500 (7:5500) diff --git a/text.asm b/text.asm index d8e01bf9..ce6f9be3 100644 --- a/text.asm +++ b/text.asm @@ -1,4 +1,4 @@ - +INCLUDE "constants/text_constants.asm" TEXT_1 EQU $26 TEXT_2 EQU $27 TEXT_3 EQU $28 @@ -21,7 +21,7 @@ _CardKeySuccessText1:: text "Bingo!@@" _CardKeySuccessText2:: - db $0 + text "" line "The CARD KEY" cont "opened the door!" done @@ -75,7 +75,7 @@ _PokeCenterSignText:: done _FoundItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcf4b text "!@@" @@ -92,7 +92,7 @@ _OaksAideHiText:: para "If you caught @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds of #MON," cont "I'm supposed to" cont "give you an" @@ -100,7 +100,7 @@ _OaksAideHiText:: TX_RAM wOaksAideRewardItemName text "!" - para "So, ", $52, "! Have" + para "So, ! Have" line "you caught at" cont "least @" TX_NUM hOaksAideRequirement, 1, 3 @@ -113,7 +113,7 @@ _OaksAideUhOhText:: line "Uh-oh! You have" cont "caught only @" TX_NUM hOaksAideNumMonsOwned, 1, 3 - db $0 + text "" cont "kinds of #MON!" para "You need @" @@ -130,7 +130,7 @@ _OaksAideComeBackText:: para "When you get @" TX_NUM hOaksAideRequirement, 1, 3 - db $0 + text "" line "kinds, come back" cont "for @" TX_RAM wOaksAideRewardItemName @@ -149,7 +149,7 @@ _OaksAideHereYouGoText:: prompt _OaksAideGotItemText:: - text $52, " got the" + text " got the" line "@" TX_RAM wOaksAideRewardItemName text "!@@" @@ -241,10 +241,10 @@ _AIBattleWithdrawText:: _AIBattleUseItemText:: TX_RAM wTrainerName - db $0 + text "" line "used @" TX_RAM wcd6d - db $0 + text "" cont "on @" TX_RAM wEnemyMonNick text "!" @@ -268,7 +268,7 @@ _TradeWentToText:: done _TradeForText:: - text "For ", $52, "'s" + text "For 's" line "@" TX_RAM wcf4b text "," @@ -306,11 +306,11 @@ _TradeWillTradeText:: text " will" line "trade @" TX_RAM wcd6d - db $0 + text "" done _TradeforText:: - text "for ", $52, "'s" + text "for 's" line "@" TX_RAM wcf4b text "." @@ -362,7 +362,7 @@ _YeahText:: _DexSeenOwnedText:: text "#DEX Seen:@" TX_NUM wDexRatingNumMonsSeen, 1, 3 - db $0 + text "" line " Owned:@" TX_NUM wDexRatingNumMonsOwned, 1, 3 db "@" @@ -373,27 +373,27 @@ _DexRatingText:: _GymStatueText1:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 + line "" done _GymStatueText2:: TX_RAM wGymCityName - db $0 + text "" line "#MON GYM" cont "LEADER: @" TX_RAM wGymLeaderName - db $0 + text "" para "WINNING TRAINERS:" - line $53 - cont $52 + line "" + cont "" done _ViridianCityPokecenterGuyText:: @@ -596,14 +596,14 @@ _CinnabarGymQuizIntroText:: para "Then get it right!" line "Here we go!" - db $51 + para "" done _CinnabarGymQuizShortIntroText:: text "#MON Quiz!" line "Test your skill!" - db $51 + para "" done _CinnabarQuizQuestionsText1:: @@ -666,7 +666,7 @@ _BillsHouseMonitorText:: done _BillsHouseInitiatedText:: - text $52, " initiated" + text " initiated" line "TELEPORTER's Cell" cont "Separator!@@" @@ -840,7 +840,7 @@ _IndigoPlateauHQText:: done _RedBedroomSNESText:: - text $52, " is" + text " is" line "playing the SNES!" cont "...Okay!" cont "It's time to go!" @@ -1019,31 +1019,31 @@ _VermilionGymTrashFailText:: cont "locks were reset!@@" _FoundHiddenItemText:: - text $52, " found" + text " found" line "@" TX_RAM wcd6d text "!@@" _HiddenItemBagFullText:: - text "But, ", $52, " has" + text "But, has" line "no more room for" cont "other items!" done _FoundHiddenCoinsText:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _FoundHiddenCoins2Text:: - text $52, " found" + text " found" line "@" - TX_BCD hCoins, $c2 + TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " coins!@@" _DroppedHiddenCoinsText:: - db $0 + text "" para "Oops! Dropped" line "some coins!" done @@ -1097,48 +1097,48 @@ _OutOfSafariBallsText:: _WildRanText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _EnemyRanText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "ran!" prompt _HurtByPoisonText:: - text $5a, "'s" + text "'s" line "hurt by poison!" prompt _HurtByBurnText:: - text $5a, "'s" + text "'s" line "hurt by the burn!" prompt _HurtByLeechSeedText:: text "LEECH SEED saps" - line $5a, "!" + line "!" prompt _EnemyMonFaintedText:: text "Enemy @" TX_RAM wEnemyMonNick - db $0 + text "" line "fainted!" prompt _MoneyForWinningText:: - text $52, " got ¥@" - TX_BCD wAmountMoneyWon, $c3 - db $0 + text " got ¥@" + TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN + text "" line "for winning!" prompt _TrainerDefeatedText:: - text $52, " defeated" + text " defeated" line "@" TX_RAM wTrainerName text "!" @@ -1146,7 +1146,7 @@ _TrainerDefeatedText:: _PlayerMonFaintedText:: TX_RAM wBattleMonNick - db $0 + text "" line "fainted!" prompt @@ -1155,20 +1155,20 @@ _UseNextMonText:: done _Sony1WinText:: - text $53, ": Yeah! Am" + text ": Yeah! Am" line "I great or what?" prompt _PlayerBlackedOutText2:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt _LinkBattleLostText:: - text $52, " lost to" + text " lost to" line "@" TX_RAM wTrainerName text "!" @@ -1182,7 +1182,7 @@ _TrainerAboutToUseText:: TX_RAM wEnemyMonNick text "!" - para "Will ", $52 + para "Will " line "change #MON?" done @@ -1247,7 +1247,7 @@ _NoMovesLeftText:: _MultiHitText:: text "Hit the enemy" line "@" - TX_NUM wPlayerNumHits,1,1 + TX_NUM wPlayerNumHits, 1, 1 text " times!" prompt @@ -1263,42 +1263,42 @@ _GetOutText:: prompt _FastAsleepText:: - text $5A + text "" line "is fast asleep!" prompt _WokeUpText:: - text $5A + text "" line "woke up!" prompt _IsFrozenText:: - text $5A + text "" line "is frozen solid!" prompt _FullyParalyzedText:: - text $5A,"'s" + text "'s" line "fully paralyzed!" prompt _FlinchedText:: - text $5A + text "" line "flinched!" prompt _MustRechargeText:: - text $5A + text "" line "must recharge!" prompt _DisabledNoMoreText:: - text $5A,"'s" + text "'s" line "disabled no more!" prompt _IsConfusedText:: - text $5A + text "" line "is confused!" prompt @@ -1308,37 +1308,37 @@ _HurtItselfText:: prompt _ConfusedNoMoreText:: - text $5A,"'s" + text "'s" line "confused no more!" prompt _SavingEnergyText:: - text $5A + text "" line "is saving energy!" prompt _UnleashedEnergyText:: - text $5A + text "" line "unleashed energy!" prompt _ThrashingAboutText:: - text $5A,"'s" + text "'s" line "thrashing about!" done _AttackContinuesText:: - text $5A,"'s" + text "'s" line "attack continues!" done _CantMoveText:: - text $5A + text "" line "can't move!" prompt _MoveIsDisabledText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcd6d text " is" @@ -1346,14 +1346,14 @@ _MoveIsDisabledText:: prompt _MonName1Text:: - text $5a, "@@" + text "@@" _Used1Text:: - db $0 + text "" line "used @@" _Used2Text:: - db $0 + text "" line "used @@" _InsteadText:: @@ -1385,24 +1385,24 @@ _ExclamationPoint5Text:: done _AttackMissedText:: - text $5a, "'s" + text "'s" line "attack missed!" prompt _KeptGoingAndCrashedText:: - text $5a + text "" line "kept going and" cont "crashed!" prompt _UnaffectedText:: - text $59, "'s" + text "'s" line "unaffected!" prompt _DoesntAffectMonText:: text "It doesn't affect" - line $59, "!" + line "!" prompt _CriticalHitText:: @@ -1439,23 +1439,23 @@ _TurnedAwayText:: _IgnoredOrdersText:: TX_RAM wBattleMonNick - db $0 + text "" line "ignored orders!" prompt _SubstituteTookDamageText:: text "The SUBSTITUTE" line "took damage for" - cont $59, "!" + cont "!" prompt _SubstituteBrokeText:: - text $59, "'s" + text "'s" line "SUBSTITUTE broke!" prompt _BuildingRageText:: - text $5a, "'s" + text "'s" line "RAGE is building!" prompt @@ -1508,21 +1508,21 @@ _NotVeryEffectiveText:: _SafariZoneEatingText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is eating!" prompt _SafariZoneAngryText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "is angry!" prompt _WildMonAppearedText:: text "Wild @" TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1530,7 +1530,7 @@ _HookedMonAttackedText:: text "The hooked" line "@" TX_RAM wEnemyMonNick - db $0 + text "" cont "attacked!" prompt @@ -1539,7 +1539,7 @@ SECTION "Text 3", ROMX, BANK[TEXT_3] _EnemyAppearedText:: TX_RAM wEnemyMonNick - db $0 + text "" line "appeared!" prompt @@ -1592,15 +1592,15 @@ _GoodText:: text "good!@@" _ComeBackText:: - db $0 + text "" line "Come back!" done ; money related _PickUpPayDayMoneyText:: - text $52, " picked up" + text " picked up" line "¥@" - TX_BCD wTotalPayDayMoney, $c3 + TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text "!" prompt @@ -1645,7 +1645,7 @@ _PartyMenuSwapMonText:: _PotionText:: TX_RAM wcd6d - db $0 + text "" line "recovered by @" TX_NUM wHPBarHPDifference, 2, 3 text "!" @@ -1677,7 +1677,7 @@ _IceHealText:: _AwakeningText:: TX_RAM wcd6d - db $0 + text "" line "woke up!" done @@ -1689,7 +1689,7 @@ _FullHealText:: _ReviveText:: TX_RAM wcd6d - db $0 + text "" line "is revitalized!" done @@ -1697,11 +1697,11 @@ _RareCandyText:: TX_RAM wcd6d text " grew" line "to level @" - TX_NUM wCurEnemyLVL, $1,$3 + TX_NUM wCurEnemyLVL, 1, 3 text "!@@" _TurnedOnPC1Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1729,7 +1729,7 @@ _AccessedMyPCText:: prompt _TurnedOnPC2Text:: - text $52, " turned on" + text " turned on" line "the PC." prompt @@ -1865,7 +1865,7 @@ _CantTakeMonText:: prompt _PikachuUnhappyText:: - TX_RAM $cd6d + TX_RAM wcd6d text " looks" line "unhappy about it!" prompt @@ -1970,13 +1970,13 @@ _DoYouWantToNicknameText:: _YourNameIsText:: text "Right! So your" - line "name is ", $52, "!" + line "name is !" prompt _HisNameIsText:: text "That's right! I" line "remember now! His" - cont "name is ", $53, "!" + cont "name is !" prompt _WillBeTradedText:: @@ -2049,19 +2049,19 @@ _ColosseumTotalL50Text:: prompt _ColosseumHeightText:: - TX_RAM $CD6D + TX_RAM wcd6d text " is over" line "6′8″ tall!" prompt _ColosseumWeightText:: - TX_RAM $CD6D + TX_RAM wcd6d text " weighs" line "over 44 pounds!" prompt _ColosseumEvolvedText:: - TX_RAM $CD6D + TX_RAM wcd6d text " is an" line "evolved #MON!" prompt @@ -2092,12 +2092,12 @@ _ColosseumVersionText:: prompt _Char00Text:: - TX_NUM hSpriteIndexOrTextID,1,2 + TX_NUM hSpriteIndexOrTextID, 1, 2 text " error." done _Char55Text:: - text $4B,"@@" + text $4B, "@@" _NoPokemonText:: text "There are no" @@ -2183,7 +2183,7 @@ _SavingText:: done _GameSavedText:: - text $52, " saved" + text " saved" line "the game!" done @@ -2203,7 +2203,7 @@ _WhenYouChangeBoxText:: _ChooseABoxText:: text "Choose a" - line $4a, " BOX.@@" + line " BOX.@@" _EvolvedText:: TX_RAM wcf4b @@ -2211,7 +2211,7 @@ _EvolvedText:: done _IntoText:: - db $0 + text "" line "into @" TX_RAM wcd6d text "!" @@ -2220,7 +2220,7 @@ _IntoText:: _StoppedEvolvingText:: text "Huh? @" TX_RAM wcf4b - db $0 + text "" line "stopped evolving!" prompt @@ -2230,47 +2230,47 @@ SECTION "Text 5", ROMX, BANK[TEXT_5] _IsEvolvingText:: text "What? @" TX_RAM wcf4b - db $0 + text "" line "is evolving!" done _FellAsleepText:: - text $59 + text "" line "fell asleep!" prompt _AlreadyAsleepText:: - text $59, "'s" + text "'s" line "already asleep!" prompt _PoisonedText:: - text $59 + text "" line "was poisoned!" prompt _BadlyPoisonedText:: - text $59, "'s" + text "'s" line "badly poisoned!" prompt _BurnedText:: - text $59 + text "" line "was burned!" prompt _FrozenText:: - text $59 + text "" line "was frozen solid!" prompt _FireDefrostedText:: text "Fire defrosted" - line $59, "!" + line "!" prompt _MonsStatsRoseText:: - text $5a, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2283,7 +2283,7 @@ _RoseText:: prompt _MonsStatsFellText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcf4b text "@@" @@ -2296,60 +2296,60 @@ _FellText:: prompt _RanFromBattleText:: - text $5a + text "" line "ran from battle!" prompt _RanAwayScaredText:: - text $59 + text "" line "ran away scared!" prompt _WasBlownAwayText:: - text $59 + text "" line "was blown away!" prompt _ChargeMoveEffectText:: - text $5a, "@@" + text "@@" _MadeWhirlwindText:: - db $0 + text "" line "made a whirlwind!" prompt _TookInSunlightText:: - db $0 + text "" line "took in sunlight!" prompt _LoweredItsHeadText:: - db $0 + text "" line "lowered its head!" prompt _SkyAttackGlowingText:: - db $0 + text "" line "is glowing!" prompt _FlewUpHighText:: - db $0 + text "" line "flew up high!" prompt _DugAHoleText:: - db $0 + text "" line "dug a hole!" prompt _BecameConfusedText:: - text $59 + text "" line "became confused!" prompt _MimicLearnedMoveText:: - text $5a + text "" line "learned" cont "@" TX_RAM wcd6d @@ -2357,7 +2357,7 @@ _MimicLearnedMoveText:: prompt _MoveWasDisabledText:: - text $59, "'s" + text "'s" line "@" TX_RAM wcd6d text " was" @@ -2378,16 +2378,16 @@ _ButItFailedText:: _DidntAffectText:: text "It didn't affect" - line $59, "!" + line "!" prompt _IsUnaffectedText:: - text $59 + text "" line "is unaffected!" prompt _ParalyzedMayNotAttackText:: - text $59, "'s" + text "'s" line "paralyzed! It may" cont "not attack!" prompt @@ -2398,7 +2398,7 @@ _SubstituteText:: prompt _HasSubstituteText:: - text $5a + text "" line "has a SUBSTITUTE!" prompt @@ -2408,23 +2408,23 @@ _TooWeakSubstituteText:: prompt _WasSeededText:: - text $59 + text "" line "was seeded!" prompt _EvadedAttackText:: - text $59 + text "" line "evaded attack!" prompt _HitWithRecoilText:: - text $5a, "'s" + text "'s" line "hit with recoil!" prompt _ConvertedTypeText:: text "Converted type to" - line $59, "'s!" + line "'s!" prompt _StatusChangesEliminatedText:: @@ -2433,28 +2433,28 @@ _StatusChangesEliminatedText:: prompt _GettingPumpedText:: - text $5a, "'s" + text "'s" line "getting pumped!" prompt _StartedSleepingEffect:: - text $5a + text "" line "started sleeping!" done _FellAsleepBecameHealthyText:: - text $5a + text "" line "fell asleep and" cont "became healthy!" done _RegainedHealthText:: - text $5a + text "" line "regained health!" prompt _TransformedText:: - text $5a + text "" line "transformed into" cont "@" TX_RAM wcd6d @@ -2462,18 +2462,18 @@ _TransformedText:: prompt _LightScreenProtectedText:: - text $5a, "'s" + text "'s" line "protected against" cont "special attacks!" prompt _ReflectGainedArmorText:: - text $5a + text "" line "gained armor!" prompt _ShroudedInMistText:: - text $5a, "'s" + text "'s" line "shrouded in mist!" prompt @@ -2484,11 +2484,11 @@ _CoinsScatteredText:: _SuckedHealthText:: text "Sucked health from" - line $59, "!" + line "!" prompt _DreamWasEatenText:: - text $59, "'s" + text "'s" line "dream was eaten!" prompt @@ -2619,15 +2619,15 @@ _PokemartGreetingText:: _PokemonFaintedText:: TX_RAM wcd6d - db $0 + text "" line "fainted!" done _PlayerBlackedOutText:: - text $52, " is out of" + text " is out of" line "useable #MON!" - para $52, " blacked" + para " blacked" line "out!" prompt @@ -2645,7 +2645,7 @@ _PokemartTellBuyPriceText:: text "?" line "That will be" cont "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text ". OK?" done @@ -2672,7 +2672,7 @@ _PokemonSellingGreetingText:: _PokemartTellSellPriceText:: text "I can pay you" line "¥@" - TX_BCD hMoney, $c3 + TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN text " for that." done @@ -2716,7 +2716,7 @@ _AbandonLearningText:: _DidNotLearnText:: TX_RAM wLearnMoveMonName - db $0 + text "" line "did not learn" cont "@" TX_RAM wcf4b @@ -2733,7 +2733,7 @@ _TryingToLearnText:: para "But, @" TX_RAM wLearnMoveMonName - db $0 + text "" line "can't learn more" cont "than 4 moves!" @@ -2751,7 +2751,7 @@ _PoofText:: text " Poof!@@" _ForgotAndText:: - db $0 + text "" para "@" TX_RAM wLearnMoveMonName text " forgot" @@ -2912,7 +2912,7 @@ _CyclingIsFunText:: prompt _GotMonText:: - text $52, " got" + text " got" line "@" TX_RAM wcd6d text "!@@" @@ -3009,7 +3009,7 @@ _ItemUseBallText06:: text "!@@" _SurfingGotOnText:: - text $52, " got on" + text " got on" line "@" TX_RAM wcd6d text "!" @@ -3022,7 +3022,7 @@ _SurfingNoPlaceToGetOffText:: _RefusingText:: TX_RAM wcd6d - db $0 + text "" line "is refusing!" prompt @@ -3040,12 +3040,12 @@ _VitaminNoEffectText:: prompt _ThrewBaitText:: - text $52, " threw" + text " threw" line "some BAIT." done _ThrewRockText:: - text $52, " threw a" + text " threw a" line "ROCK." done @@ -3063,13 +3063,13 @@ _FluteWokeUpText:: prompt _PlayedFluteHadEffectText:: - text $52, " played the" + text " played the" line "# FLUTE.@@" _CoinCaseNumCoinsText:: text "Coins" line "@" - TX_BCD wPlayerCoins, $c2 + TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN text " " prompt @@ -3126,7 +3126,7 @@ _TeachMachineMoveText:: para "Teach @" TX_RAM wcf4b - db $0 + text "" line "to a #MON?" done @@ -3145,7 +3145,7 @@ _MonCannotLearnMachineMoveText:: prompt _ItemUseNotTimeText:: - text "OAK: ", $52, "!" + text "OAK: !" line "This isn't the" cont "time to use that! " prompt @@ -3193,7 +3193,7 @@ _DontHavePokemonText:: prompt _ItemUseText001:: - text $52," used@@" + text " used@@" _ItemUseText002:: TX_RAM wcf4b @@ -3201,7 +3201,7 @@ _ItemUseText002:: done _GotOnBicycleText1:: - text $52, " got on the@@" + text " got on the@@" _GotOnBicycleText2:: TX_RAM wcf4b @@ -3209,7 +3209,7 @@ _GotOnBicycleText2:: prompt _GotOffBicycleText1:: - text $52, " got off@@" + text " got off@@" _GotOffBicycleText2:: text "the @" @@ -3250,7 +3250,7 @@ _ConnectCableText:: prompt _TradedForText:: - text $52, " traded" + text " traded" line "@" TX_RAM wInGameTradeGiveMonName text " for" @@ -3302,7 +3302,7 @@ _WannaTrade2Text:: para "your @" TX_RAM wInGameTradeGiveMonName - db $0 + text "" line "for @" TX_RAM wInGameTradeReceiveMonName text "?" diff --git a/text/maps/hall_of_fame.asm b/text/maps/hall_of_fame.asm index e4b8de4f..cbb0e52b 100644 --- a/text/maps/hall_of_fame.asm +++ b/text/maps/hall_of_fame.asm @@ -1,7 +1,7 @@ _HallofFameRoomText1:: text "OAK: Er-hem!" line "Congratulations," - cont $52, "!" + cont "!" para "This floor is the" line "#MON HALL OF" @@ -16,13 +16,13 @@ _HallofFameRoomText1:: line "also recorded in" cont "the HALL OF FAME!" - para $52, "! You have" + para "! You have" line "endeavored hard" cont "to become the new" cont "LEAGUE champion!" para "Congratulations," - line $52, ", you and" + line ", you and" cont "your #MON are" cont "HALL OF FAMERs!" done -- cgit v1.3.1-sl0p From bb2aea02d5f1a9a022993259e4c9993a4df02c98 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 15:42:29 -0400 Subject: Rocket Hideout and tileset headers --- constants/hide_show_constants.asm | 250 +++++++++++----------- data/mapObjects/rockethideout4.asm | 4 +- data/map_header_banks.asm | 10 +- data/map_header_pointers.asm | 16 +- data/tileset_headers.asm | 52 ++--- main.asm | 92 +++++++- scripts/rockethideout4.asm | 428 +++++++++++++++++++++++++++---------- 7 files changed, 562 insertions(+), 290 deletions(-) (limited to 'constants') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index f23c57aa..4ca9e178 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -1,8 +1,6 @@ ; this is a list of the sprites that can be enabled/disabled during the game -; sprites marked with an X are constants that are never used -; because those sprites are not (de)activated in a map's script -; (they are either items or sprites that deactivate after battle -; and are detected in wMissableObjectList) +; there may be unused sprites, but these will remain unmarked until +; the disassembly is complete const_def @@ -31,20 +29,20 @@ const HS_SAFFRON_CITY_C ; 16 const HS_SAFFRON_CITY_D ; 17 const HS_SAFFRON_CITY_E ; 18 - const HS_SAFFRON_CITY_F ; 19 X - const HS_ROUTE_2_ITEM_1 ; 1A X - const HS_ROUTE_2_ITEM_2 ; 1B X - const HS_ROUTE_4_ITEM ; 1C X + const HS_SAFFRON_CITY_F ; 19 + const HS_ROUTE_2_ITEM_1 ; 1A + const HS_ROUTE_2_ITEM_2 ; 1B + const HS_ROUTE_4_ITEM ; 1C const HS_ROUTE_9_ITEM ; 1D - const HS_ROUTE_12_SNORLAX ; 1E X - const HS_ROUTE_12_ITEM_1 ; 1F X - const HS_ROUTE_12_ITEM_2 ; 20 X + const HS_ROUTE_12_SNORLAX ; 1E + const HS_ROUTE_12_ITEM_1 ; 1F + const HS_ROUTE_12_ITEM_2 ; 20 const HS_ROUTE_15_ITEM ; 21 const HS_ROUTE_16_SNORLAX ; 22 const HS_ROUTE_22_RIVAL_1 ; 23 const HS_ROUTE_22_RIVAL_2 ; 24 - const HS_NUGGET_BRIDGE_GUY ; 25 X - const HS_ROUTE_24_ITEM ; 26 X + const HS_NUGGET_BRIDGE_GUY ; 25 + const HS_ROUTE_24_ITEM ; 26 const HS_ROUTE_25_ITEM ; 27 const HS_DAISY_SITTING ; 28 const HS_DAISY_WALKING ; 29 @@ -57,126 +55,126 @@ const HS_OAKS_LAB_OAK_2 ; 30 const HS_VIRIDIAN_GYM_GIOVANNI ; 31 const HS_VIRIDIAN_GYM_ITEM ; 32 - const HS_OLD_AMBER ; 33 X + const HS_OLD_AMBER ; 33 const HS_CERULEAN_BULBASAUR ; 34 - 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_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_UNKNOWN_DUNGEON_1_ITEM_1 ; 35 + const HS_UNKNOWN_DUNGEON_1_ITEM_2 ; 36 + const HS_UNKNOWN_DUNGEON_1_ITEM_3 ; 37 + const HS_UNKNOWN_DUNGEON_1_ITEM_4 ; 38 + const HS_POKEMONTOWER_2_RIVAL ; 39 + const HS_POKEMONTOWER_3_ITEM ; 3A + const HS_POKEMONTOWER_4_ITEM_1 ; 3B + const HS_POKEMONTOWER_4_ITEM_2 ; 3C + const HS_POKEMONTOWER_4_ITEM_3 ; 3D + const HS_POKEMONTOWER_5_ITEM ; 3E + const HS_POKEMONTOWER_6_ITEM_1 ; 3F + const HS_POKEMONTOWER_6_ITEM_2 ; 40 + const HS_POKEMONTOWER_7_JESSIE ; 41 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 const HS_GAME_CORNER_ROCKET ; 46 - const HS_FUCHSIA_HOUSE_2_ITEM ; 47 X - const HS_MANSION_1_ITEM_1 ; 48 X - const HS_MANSION_1_ITEM_2 ; 49 X + const HS_FUCHSIA_HOUSE_2_ITEM ; 47 + const HS_MANSION_1_ITEM_1 ; 48 + const HS_MANSION_1_ITEM_2 ; 49 const HS_FIGHTING_DOJO_GIFT_1 ; 4A const HS_FIGHTING_DOJO_GIFT_2 ; 4B const HS_SILPH_CO_1F_RECEPTIONIST ; 4C - const HS_VOLTORB_1 ; 4D X - const HS_VOLTORB_2 ; 4E X - const HS_VOLTORB_3 ; 4F X - const HS_ELECTRODE_1 ; 50 X - const HS_VOLTORB_4 ; 51 X - const HS_VOLTORB_5 ; 52 X - const HS_ELECTRODE_2 ; 53 X - const HS_VOLTORB_6 ; 54 X - const HS_ZAPDOS ; 55 X - const HS_POWER_PLANT_ITEM_1 ; 56 X - const HS_POWER_PLANT_ITEM_2 ; 57 X - const HS_POWER_PLANT_ITEM_3 ; 58 X - const HS_POWER_PLANT_ITEM_4 ; 59 X - const HS_POWER_PLANT_ITEM_5 ; 5A X - const HS_MOLTRES ; 5B X - const HS_VICTORY_ROAD_2_ITEM_1 ; 5C X - const HS_VICTORY_ROAD_2_ITEM_2 ; 5D X - const HS_VICTORY_ROAD_2_ITEM_3 ; 5E X - const HS_VICTORY_ROAD_2_ITEM_4 ; 5F X + const HS_VOLTORB_1 ; 4D + const HS_VOLTORB_2 ; 4E + const HS_VOLTORB_3 ; 4F + const HS_ELECTRODE_1 ; 50 + const HS_VOLTORB_4 ; 51 + const HS_VOLTORB_5 ; 52 + const HS_ELECTRODE_2 ; 53 + const HS_VOLTORB_6 ; 54 + const HS_ZAPDOS ; 55 + const HS_POWER_PLANT_ITEM_1 ; 56 + const HS_POWER_PLANT_ITEM_2 ; 57 + const HS_POWER_PLANT_ITEM_3 ; 58 + const HS_POWER_PLANT_ITEM_4 ; 59 + const HS_POWER_PLANT_ITEM_5 ; 5A + const HS_MOLTRES ; 5B + const HS_VICTORY_ROAD_2_ITEM_1 ; 5C + const HS_VICTORY_ROAD_2_ITEM_2 ; 5D + const HS_VICTORY_ROAD_2_ITEM_3 ; 5E + const HS_VICTORY_ROAD_2_ITEM_4 ; 5F const HS_VICTORY_ROAD_2_BOULDER ; 60 const HS_BILL_POKEMON ; 61 const HS_BILL_1 ; 62 const HS_BILL_2 ; 63 - const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 X - const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 X - const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 X + const HS_VIRIDIAN_FOREST_ITEM_1 ; 64 + const HS_VIRIDIAN_FOREST_ITEM_2 ; 65 + const HS_VIRIDIAN_FOREST_ITEM_3 ; 66 const HS_MT_MOON_1_ITEM_1 ; 67 const HS_MT_MOON_1_ITEM_2 ; 68 - const HS_MT_MOON_1_ITEM_3 ; 69 X - const HS_MT_MOON_1_ITEM_4 ; 6A X - const HS_MT_MOON_1_ITEM_5 ; 6B X - const HS_MT_MOON_1_ITEM_6 ; 6C X + const HS_MT_MOON_1_ITEM_3 ; 69 + const HS_MT_MOON_1_ITEM_4 ; 6A + const HS_MT_MOON_1_ITEM_5 ; 6B + const HS_MT_MOON_1_ITEM_6 ; 6C const HS_MT_MOON_JESSIE ; 6D const HS_MT_MOON_JAMES ; 6E - const HS_MT_MOON_3_FOSSIL_1 ; 6F X - const HS_MT_MOON_3_FOSSIL_2 ; 70 X + const HS_MT_MOON_3_FOSSIL_1 ; 6F + const HS_MT_MOON_3_FOSSIL_2 ; 70 const HS_MT_MOON_3_ITEM_1 ; 71 - const HS_MT_MOON_3_ITEM_2 ; 72 X - const HS_SS_ANNE_2_RIVAL ; 73 X - const HS_SS_ANNE_8_ITEM ; 74 X - const HS_SS_ANNE_9_ITEM_1 ; 75 X - const HS_SS_ANNE_9_ITEM_2 ; 76 X - const HS_SS_ANNE_10_ITEM_1 ; 77 X - const HS_SS_ANNE_10_ITEM_2 ; 78 X - const HS_SS_ANNE_10_ITEM_3 ; 79 X + const HS_MT_MOON_3_ITEM_2 ; 72 + const HS_SS_ANNE_2_RIVAL ; 73 + const HS_SS_ANNE_8_ITEM ; 74 + const HS_SS_ANNE_9_ITEM_1 ; 75 + const HS_SS_ANNE_9_ITEM_2 ; 76 + const HS_SS_ANNE_10_ITEM_1 ; 77 + const HS_SS_ANNE_10_ITEM_2 ; 78 + const HS_SS_ANNE_10_ITEM_3 ; 79 const HS_VICTORY_ROAD_3_ITEM_1 ; 7A const HS_VICTORY_ROAD_3_ITEM_2 ; 7B - const HS_VICTORY_ROAD_3_BOULDER ; 7C X - const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7D X - const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7E X - const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7F X - const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 80 X - const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 81 X - const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 82 X + const HS_VICTORY_ROAD_3_BOULDER ; 7C + const HS_ROCKET_HIDEOUT_1_ITEM_1 ; 7D + const HS_ROCKET_HIDEOUT_1_ITEM_2 ; 7E + const HS_ROCKET_HIDEOUT_2_ITEM_1 ; 7F + const HS_ROCKET_HIDEOUT_2_ITEM_2 ; 80 + const HS_ROCKET_HIDEOUT_2_ITEM_3 ; 81 + const HS_ROCKET_HIDEOUT_2_ITEM_4 ; 82 const HS_ROCKET_HIDEOUT_3_ITEM_1 ; 83 - const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 84 X - const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 85 X - const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 86 X - const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 87 - 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 HS_ROCKET_HIDEOUT_4_ITEM_6 ; 8B - const HS_ROCKET_HIDEOUT_4_ITEM_7 ; 8C + const HS_ROCKET_HIDEOUT_3_ITEM_2 ; 84 + const HS_ROCKET_HIDEOUT_4_GIOVANNI ; 85 + const HS_ROCKET_HIDEOUT_4_JAMES ; 86 + const HS_ROCKET_HIDEOUT_4_JESSIE ; 87 + const HS_ROCKET_HIDEOUT_4_ITEM_1 ; 88 + const HS_ROCKET_HIDEOUT_4_ITEM_2 ; 89 + const HS_ROCKET_HIDEOUT_4_ITEM_3 ; 8A + const HS_ROCKET_HIDEOUT_4_ITEM_4 ; 8B + const HS_ROCKET_HIDEOUT_4_ITEM_5 ; 8C const HS_SILPH_CO_2F_1 ; 8D const HS_SILPH_CO_2F_2 ; 8E const HS_SILPH_CO_2F_3 ; 8F - const HS_SILPH_CO_2F_4 ; 90 X + const HS_SILPH_CO_2F_4 ; 90 const HS_SILPH_CO_2F_5 ; 91 const HS_SILPH_CO_3F_1 ; 92 const HS_SILPH_CO_3F_2 ; 93 - const HS_SILPH_CO_3F_ITEM ; 94 X - const HS_SILPH_CO_4F_1 ; 95 X - const HS_SILPH_CO_4F_2 ; 96 X + const HS_SILPH_CO_3F_ITEM ; 94 + const HS_SILPH_CO_4F_1 ; 95 + const HS_SILPH_CO_4F_2 ; 96 const HS_SILPH_CO_4F_3 ; 97 const HS_SILPH_CO_4F_ITEM_1 ; 98 const HS_SILPH_CO_4F_ITEM_2 ; 99 const HS_SILPH_CO_4F_ITEM_3 ; 9A - const HS_SILPH_CO_5F_1 ; 9B X - const HS_SILPH_CO_5F_2 ; 9C X - const HS_SILPH_CO_5F_3 ; 9D X + const HS_SILPH_CO_5F_1 ; 9B + const HS_SILPH_CO_5F_2 ; 9C + const HS_SILPH_CO_5F_3 ; 9D const HS_SILPH_CO_5F_4 ; 9E const HS_SILPH_CO_5F_ITEM_1 ; 9F const HS_SILPH_CO_5F_ITEM_2 ; A0 - const HS_SILPH_CO_5F_ITEM_3 ; A1 X - const HS_SILPH_CO_6F_1 ; A2 X + const HS_SILPH_CO_5F_ITEM_3 ; A1 + const HS_SILPH_CO_6F_1 ; A2 const HS_SILPH_CO_6F_2 ; A3 const HS_SILPH_CO_6F_3 ; A4 const HS_SILPH_CO_6F_ITEM_1 ; A5 const HS_SILPH_CO_6F_ITEM_2 ; A6 const HS_SILPH_CO_7F_1 ; A7 - const HS_SILPH_CO_7F_2 ; A8 X - const HS_SILPH_CO_7F_3 ; A9 X - const HS_SILPH_CO_7F_4 ; AA XXX sprite doesn't exist + const HS_SILPH_CO_7F_2 ; A8 + const HS_SILPH_CO_7F_3 ; A9 + const HS_SILPH_CO_7F_4 ; AA const HS_SILPH_CO_7F_RIVAL ; AB const HS_SILPH_CO_7F_ITEM_1 ; AC const HS_SILPH_CO_7F_ITEM_2 ; AD @@ -185,41 +183,41 @@ const HS_SILPH_CO_8F_2 ; B0 const HS_SILPH_CO_8F_3 ; B1 const HS_SILPH_CO_9F_1 ; B2 - const HS_SILPH_CO_9F_2 ; B3 XXX never (de)activated? - const HS_SILPH_CO_9F_3 ; B4 X - const HS_SILPH_CO_10F_1 ; B5 X - const HS_SILPH_CO_10F_2 ; B6 X + const HS_SILPH_CO_9F_2 ; B3 + const HS_SILPH_CO_9F_3 ; B4 + const HS_SILPH_CO_10F_1 ; B5 + const HS_SILPH_CO_10F_2 ; B6 const HS_SILPH_CO_10F_3 ; B7 const HS_SILPH_CO_10F_ITEM_1 ; B8 const HS_SILPH_CO_10F_ITEM_2 ; B9 - 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_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_SILPH_CO_10F_ITEM_3 ; BA + const HS_SILPH_CO_11F_1 ; BB + const HS_SILPH_CO_11F_2 ; BC + const HS_SILPH_CO_11F_JESSIE ; BD + const HS_SILPH_CO_11F_JAMES ; BE + const HS_MAP_F4_1 ; BF + const HS_MANSION_2_ITEM ; C0 + const HS_MANSION_3_ITEM_1 ; C1 + const HS_MANSION_3_ITEM_2 ; C2 + const HS_MANSION_4_ITEM_1 ; C3 + const HS_MANSION_4_ITEM_2 ; C4 + const HS_MANSION_4_ITEM_3 ; C5 + const HS_MANSION_4_ITEM_4 ; C6 + const HS_MANSION_4_ITEM_5 ; C7 + const HS_SAFARI_ZONE_EAST_ITEM_1 ; C8 + const HS_SAFARI_ZONE_EAST_ITEM_2 ; C9 + const HS_SAFARI_ZONE_EAST_ITEM_3 ; CA + const HS_SAFARI_ZONE_EAST_ITEM_4 ; CB + const HS_SAFARI_ZONE_NORTH_ITEM_1 ; CC + const HS_SAFARI_ZONE_NORTH_ITEM_2 ; CD + const HS_SAFARI_ZONE_WEST_ITEM_1 ; CE + const HS_SAFARI_ZONE_WEST_ITEM_2 ; CF + const HS_SAFARI_ZONE_WEST_ITEM_3 ; D0 + const HS_SAFARI_ZONE_WEST_ITEM_4 ; D1 + const HS_SAFARI_ZONE_CENTER_ITEM ; D2 + const HS_UNKNOWN_DUNGEON_2_ITEM_1 ; D3 + const HS_UNKNOWN_DUNGEON_2_ITEM_2 ; D4 + const HS_UNKNOWN_DUNGEON_2_ITEM_3 ; D5 const HS_UNKNOWN_DUNGEON_2_ITEM_4 ; D6 const HS_MEWTWO ; D7 const HS_UNKNOWN_DUNGEON_3_ITEM_1 ; D8 diff --git a/data/mapObjects/rockethideout4.asm b/data/mapObjects/rockethideout4.asm index 5441f9cd..616f5a75 100755 --- a/data/mapObjects/rockethideout4.asm +++ b/data/mapObjects/rockethideout4.asm @@ -10,8 +10,8 @@ RocketHideout4Object: ; 0x455f1 (size=95) db $9 ; objects object SPRITE_GIOVANNI, $19, $3, STAY, DOWN, $1, OPP_GIOVANNI, $1 - object SPRITE_ROCKET, $17, $c, STAY, DOWN, $2, OPP_ROCKET, $10 - object SPRITE_ROCKET, $1a, $c, STAY, DOWN, $3, OPP_ROCKET, $11 + object SPRITE_JAMES, $19, $a, STAY, DOWN, $2 + object SPRITE_JESSIE, $18, $a, STAY, DOWN, $3 object SPRITE_ROCKET, $b, $2, STAY, DOWN, $4, OPP_ROCKET, $12 object SPRITE_BALL, $a, $c, STAY, NONE, $5, HP_UP object SPRITE_BALL, $9, $4, STAY, NONE, $6, TM_02 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 532c9c85..04bee42f 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -199,11 +199,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(VermilionHouse3_h) db BANK(DiglettsCave_h) db BANK(VictoryRoad3_h) - db $11 ; db BANK(RocketHideout1_h) - db $11 ; db BANK(RocketHideout2_h) - db $11 ; db BANK(RocketHideout3_h) - db $11 ; db BANK(RocketHideout4_h) - db $11 ; db BANK(RocketHideoutElevator_h) + db BANK(RocketHideout1_h) + db BANK(RocketHideout2_h) + db BANK(RocketHideout3_h) + db BANK(RocketHideout4_h) + db BANK(RocketHideoutElevator_h) db $01 ; unused db $01 ; unused db $01 ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 23b17f2f..501724af 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -199,14 +199,14 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw VermilionHouse3_h dw DiglettsCave_h dw VictoryRoad3_h - dw $4c5e ; dw RocketHideout1_h - dw $4ebb ; dw RocketHideout2_h ;200 - dw $52b9 ; dw RocketHideout3_h - dw $54f1 ; dw RocketHideout4_h - dw $5958 ; dw RocketHideoutElevator_h - dw $5958 ; dw RocketHideoutElevator_h ; unused - dw $5958 ; dw RocketHideoutElevator_h ; unused - dw $5958 ; dw RocketHideoutElevator_h ; unused + dw RocketHideout1_h + dw RocketHideout2_h ;200 + dw RocketHideout3_h + dw RocketHideout4_h + dw RocketHideoutElevator_h + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused dw $5c80 ; dw SilphCo2_h dw $5eea ; dw SilphCo3_h dw $5e09 ; dw SilphCo4_h diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index c21474f8..d6c6a2c9 100755 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,28 +1,28 @@ Tilesets: ; c558 (3:4558) - dr $c558,$c684 + ; dr $c558,$c684 - ;tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR - ;tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR - ;tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE - ;tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR - ;tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR - ;tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR - ;tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR - ;tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR - ;tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE - ;tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR - ;tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR - ;tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR - ;tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE - ;tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE - ;tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR \ No newline at end of file + tileset Overworld_Block, Overworld_GFX, Overworld_Coll, $FF,$FF,$FF, $52, OUTDOOR + tileset RedsHouse1_Block, RedsHouse1_GFX, RedsHouse1_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Mart_Block, Mart_GFX, Mart_Coll, $18,$19,$1E, $FF, INDOOR + tileset Forest_Block, Forest_GFX, Forest_Coll, $FF,$FF,$FF, $20, CAVE + tileset RedsHouse2_Block, RedsHouse2_GFX, RedsHouse2_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Dojo_Block, Dojo_GFX, Dojo_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset Pokecenter_Block, Pokecenter_GFX, Pokecenter_Coll, $18,$19,$1E, $FF, INDOOR + tileset Gym_Block, Gym_GFX, Gym_Coll, $3A,$FF,$FF, $FF, OUTDOOR + tileset House_Block, House_GFX, House_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset ForestGate_Block, ForestGate_GFX, ForestGate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Museum_Block, Museum_GFX, Museum_Coll, $17,$32,$FF, $FF, INDOOR + tileset Underground_Block, Underground_GFX, Underground_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Gate_Block, Gate_GFX, Gate_Coll, $17,$32,$FF, $FF, INDOOR + tileset Ship_Block, Ship_GFX, Ship_Coll, $FF,$FF,$FF, $FF, CAVE + tileset ShipPort_Block, ShipPort_GFX, ShipPort_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Cemetery_Block, Cemetery_GFX, Cemetery_Coll, $12,$FF,$FF, $FF, INDOOR + tileset Interior_Block, Interior_GFX, Interior_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Cavern_Block, Cavern_GFX, Cavern_Coll, $FF,$FF,$FF, $FF, CAVE + tileset Lobby_Block, Lobby_GFX, Lobby_Coll, $15,$36,$FF, $FF, INDOOR + tileset Mansion_Block, Mansion_GFX, Mansion_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Lab_Block, Lab_GFX, Lab_Coll, $FF,$FF,$FF, $FF, INDOOR + tileset Club_Block, Club_GFX, Club_Coll, $07,$17,$FF, $FF, INDOOR + tileset Facility_Block, Facility_GFX, Facility_Coll, $12,$FF,$FF, $FF, CAVE + tileset Plateau_Block, Plateau_GFX, Plateau_Coll, $FF,$FF,$FF, $45, CAVE + tileset BeachHouse_Block, BeachHouse_GFX, BeachHouse_Coll, $FF,$FF,$FF, $FF, INDOOR diff --git a/main.asm b/main.asm index be127cd0..f66f8123 100755 --- a/main.asm +++ b/main.asm @@ -879,10 +879,32 @@ INCLUDE "data/mapHeaders/victoryroad3.asm" INCLUDE "scripts/victoryroad3.asm" INCLUDE "data/mapObjects/victoryroad3.asm" VictoryRoad3Blocks: INCBIN "maps/victoryroad3.blk" - dr $44c5e,$45077 -LoadSpinnerArrowTiles: ; 45077 (11:5077) - dr $45077,$46578 +INCLUDE "data/mapHeaders/rockethideout1.asm" +INCLUDE "scripts/rockethideout1.asm" +INCLUDE "data/mapObjects/rockethideout1.asm" +RocketHideout1Blocks: INCBIN "maps/rockethideout1.blk" + +INCLUDE "data/mapHeaders/rockethideout2.asm" +INCLUDE "scripts/rockethideout2.asm" +INCLUDE "data/mapObjects/rockethideout2.asm" +RocketHideout2Blocks: INCBIN "maps/rockethideout2.blk" + +INCLUDE "data/mapHeaders/rockethideout3.asm" +INCLUDE "scripts/rockethideout3.asm" +INCLUDE "data/mapObjects/rockethideout3.asm" +RocketHideout3Blocks: INCBIN "maps/rockethideout3.blk" + +INCLUDE "data/mapHeaders/rockethideout4.asm" +INCLUDE "scripts/rockethideout4.asm" +INCLUDE "data/mapObjects/rockethideout4.asm" +RocketHideout4Blocks: INCBIN "maps/rockethideout4.blk" + +INCLUDE "data/mapHeaders/rockethideoutelevator.asm" +INCLUDE "scripts/rockethideoutelevator.asm" +INCLUDE "data/mapObjects/rockethideoutelevator.asm" +RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk" + dr $45a08,$46578 INCLUDE "data/mapHeaders/seafoamislands2.asm" INCLUDE "scripts/seafoamislands2.asm" @@ -1658,12 +1680,68 @@ INCLUDE "engine/hidden_object_functions18.asm" SECTION "bank19",ROMX,BANK[$19] Overworld_GFX: - dr $64000,$68000 - + dr $64000,$64600 +Overworld_Block: + dr $64600,$64e00 +RedsHouse1_GFX: +RedsHouse2_GFX: + dr $64e00,$65290 +RedsHouse1_Block: +RedsHouse2_Block: + dr $65290,$653c0 +House_GFX: + dr $653c0,$659a0 +House_Block: + dr $659a0,$65bd0 +Mansion_GFX: + dr $65bd0,$661b0 +Mansion_Block: + dr $661b0,$66630 +ShipPort_GFX: + dr $66630,$66c10 +ShipPort_Block: + dr $66c10,$66d80 +Interior_GFX: + dr $66d80,$67370 +Interior_Block: + dr $67370,$67710 +Plateau_GFX: + dr $67710,$67b70 +Plateau_Block: + dr $67b70,$68000 SECTION "bank1A",ROMX,BANK[$1A] - - dr $68000,$6bff1 + dr $68000,$68040 +Dojo_GFX: +Gym_GFX: + dr $68040,$68640 +Dojo_Block: +Gym_Block: + dr $68640,$68d80 +Mart_GFX: +Pokecenter_GFX: + dr $68d80,$69380 +Mart_Block: +Pokecenter_Block: + dr $69380,$69600 +ForestGate_GFX: +Gate_GFX: + dr $69600,$69600 +Museum_GFX: + dr $69600,$69bf0 +ForestGate_Block: +Gate_Block: + dr $69bf0,$69bf0 +Museum_Block: + dr $69bf0,$6a3f0 +Forest_GFX: + dr $6a3f0,$6a9f0 +Forest_Block: + dr $6a9f0,$6b1f0 +Facility_GFX: + dr $6b1f0,$6b7f0 +Facility_Block: + dr $6b7f0,$6bff1 SECTION "bank1B",ROMX,BANK[$1B] diff --git a/scripts/rockethideout4.asm b/scripts/rockethideout4.asm index 815f6090..75cb7912 100755 --- a/scripts/rockethideout4.asm +++ b/scripts/rockethideout4.asm @@ -1,5 +1,4 @@ RocketHideout4Script: ; 4545d (11:545d) - call RocketHideout4Script_45473 call EnableAutoTextBoxDrawing ld hl, RocketHideout4TrainerHeader0 ld de, RocketHideout4ScriptPointers @@ -8,47 +7,44 @@ RocketHideout4Script: ; 4545d (11:545d) ld [W_ROCKETHIDEOUT4CURSCRIPT], a ret -RocketHideout4Script_45473: ; 45473 (11:5473) - ld hl, wd126 - bit 5, [hl] - res 5, [hl] - ret z - CheckEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED - jr nz, .asm_45496 - CheckBothEventsSet EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0, EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2, 1 - jr z, .asm_4548c - ld a, $2d - jr .asm_45498 -.asm_4548c - ld a, SFX_GO_INSIDE - call PlaySound - SetEvent EVENT_ROCKET_HIDEOUT_4_DOOR_UNLOCKED -.asm_45496 - ld a, $e -.asm_45498 - ld [wNewTileBlockID], a - lb bc, 5, 12 - predef_jump ReplaceTileBlock - -RocketHideout4Script_454a3: ; 454a3 (11:54a3) +RocketHideout4Script_45510: ; 45510 (11:54a3) + CheckAndResetEvent EVENT_6A0 + call nz, RocketHideout4Script_45525 xor a ld [wJoyIgnore], a +RocketHideout4Script_4551e: ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret +RocketHideout4Script_45525: + ld a, HS_ROCKET_HIDEOUT_4_JAMES + call RocketHideout4Script_45756 + ld a, HS_ROCKET_HIDEOUT_4_JESSIE + call RocketHideout4Script_45756 + ret + RocketHideout4ScriptPointers: ; 454ae (11:54ae)c - dw CheckFightingMapTrainers + dw RocketHideout4Script0 dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle dw RocketHideout4Script3 + dw RocketHideout4Script4 + dw RocketHideout4Script5 + dw RocketHideout4Script6 + dw RocketHideout4Script7 + dw RocketHideout4Script8 + dw RocketHideout4Script9 + dw RocketHideout4Script10 + dw RocketHideout4Script11 + dw RocketHideout4Script12 + dw RocketHideout4Script13 RocketHideout4Script3: ; 454b6 (11:54b6) ld a, [wIsInBattle] cp $ff - jp z, RocketHideout4Script_454a3 - call UpdateSprites - ld a, $f0 + jp z, RocketHideout4Script_45510 + ld a, $fc ld [wJoyIgnore], a SetEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI ld a, $a @@ -72,61 +68,296 @@ RocketHideout4Script3: ; 454b6 (11:54b6) ld [W_CURMAPSCRIPT], a ret +RocketHideout4Script0: + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 + call z, RocketHideout4Script_455a5 + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 + call z, CheckFightingMapTrainers + ret + +RocketHideout4Script_455a5: + ld a, [wYCoord] + cp $e + ret nz + ResetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + ld a, [wXCoord] + cp $18 + jr z, .asm_455c2 + ld a, [wXCoord] + cp $19 + ret nz + SetEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 +.asm_455c2 + xor a + ld [hJoyHeld], a + ld a, $fc + ld [wJoyIgnore], a + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + call UpdateSprites + call Delay3 + call UpdateSprites + call Delay3 + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $b + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $ff + ld [wJoyIgnore], a + ld a, HS_ROCKET_HIDEOUT_4_JAMES + call RocketHideout4Script_45747 + ld a, HS_ROCKET_HIDEOUT_4_JESSIE + call RocketHideout4Script_45747 + ld a, $4 + call RocketHideout4Script_4551e + ret + +RocketHideout4JessieJamesMovementData_45605: + db $4 +RocketHideout4JessieJamesMovementData_45606: + db $4 + db $4 + db $4 + db $ff + +RocketHideout4Script4: + ld de, RocketHideout4JessieJamesMovementData_45605 + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + jr z, .asm_45617 + ld de, RocketHideout4JessieJamesMovementData_45606 +.asm_45617 + ld a, $2 + ld [hSpriteIndexOrTextID], a + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $5 + call RocketHideout4Script_4551e + ret + +RocketHideout4Script5: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz +RocketHideout4Script6: + ld a, $2 + ld [wSpriteStateData1 + 2 * $10 + 1], a + ld a, SPRITE_FACING_LEFT + ld [wSpriteStateData1 + 2 * $10 + 9], a + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + jr z, .asm_4564a + ld a, SPRITE_FACING_DOWN + ld [wSpriteStateData1 + 2 * $10 + 9], a +.asm_4564a + call Delay3 + ld a, $fc + ld [wJoyIgnore], a +RocketHideout4Script7: + ld de, RocketHideout4JessieJamesMovementData_45606 + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + jr z, .asm_4565f + ld de, RocketHideout4JessieJamesMovementData_45605 +.asm_4565f + ld a, $3 + ld [hSpriteIndexOrTextID], a + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $8 + call RocketHideout4Script_4551e + ret + +RocketHideout4Script8: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz + ld a, $fc + ld [wJoyIgnore], a +RocketHideout4Script9: + ld a, $2 + ld [wSpriteStateData1 + 3 * $10 + 1], a + ld a, SPRITE_FACING_DOWN + ld [wSpriteStateData1 + 3 * $10 + 9], a + CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 + jr z, .asm_45697 + ld a, SPRITE_FACING_RIGHT + ld [wSpriteStateData1 + 3 * $10 + 9], a +.asm_45697 + call Delay3 + ld a, $c + ld [hSpriteIndexOrTextID], a + call DisplayTextID +RocketHideout4Script10: + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, RocketHideout4JessieJamesEndBattleText ; 457b2 + ld de, RocketHideout4JessieJamesEndBattleText ; 457b2 + call SaveEndBattleTextPointers + ld a, OPP_ROCKET + ld [wCurOpponent], a + ld a, $2b + ld [wTrainerNo], a + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + SetEvent EVENT_6A0 + ld a, $b + call RocketHideout4Script_4551e + ret + +RocketHideout4Script11: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wIsInBattle] + cp $ff + jp z, RocketHideout4Script_45510 + ld a, $2 + ld [wSpriteStateData1 + 2 * $10 + 1], a + ld [wSpriteStateData1 + 3 * $10 + 1], a + xor a + ld [wSpriteStateData1 + 2 * $10 + 9], a + ld [wSpriteStateData1 + 3 * $10 + 9], a + ld a, $fc + ld [wJoyIgnore], a + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $d + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + ld a, $ff + ld [wJoyIgnore], a + ld a, $c + call RocketHideout4Script_4551e + ret + +RocketHideout4Script12: + ld a, $ff + ld [wJoyIgnore], a + call GBFadeOutToBlack + ld a, HS_ROCKET_HIDEOUT_4_JAMES + call RocketHideout4Script_45756 + ld a, HS_ROCKET_HIDEOUT_4_JESSIE + call RocketHideout4Script_45756 + call UpdateSprites + call Delay3 + call GBFadeInFromBlack + ld a, $d + call RocketHideout4Script_4551e + ret + +RocketHideout4Script13: + call PlayDefaultMusic + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + ld hl, wd81b + set 2, [hl] + ld a, $0 + call RocketHideout4Script_4551e + ret + +RocketHideout4Script_45747: + ld [wMissableObjectIndex], a + predef ShowObject + call UpdateSprites + call Delay3 + ret + +RocketHideout4Script_45756: + ld [wMissableObjectIndex], a + predef HideObject + ret + RocketHideout4TextPointers: ; 45501 (11:5501) + dw RocketHideout4Text0 dw RocketHideout4Text1 dw RocketHideout4Text2 dw RocketHideout4Text3 - dw RocketHideout4Text4 dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText dw PickUpItemText + dw RocketHideout4Text9 dw RocketHideout4Text10 + dw RocketHideout4Text11 + dw RocketHideout4Text12 -RocketHideout4TrainerHeaders: ; 45515 (11:5515) -RocketHideout4TrainerHeader0: ; 45515 (11:5515) - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_0 - dw RocketHideout4BattleText2 ; TextBeforeBattle - dw RocketHideout4AfterBattleText2 ; TextAfterBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - dw RocketHideout4EndBattleText2 ; TextEndBattle - -RocketHideout4TrainerHeader2: ; 45521 (11:5521) - dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - db ($0 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_2 - dw RocketHideout4BattleText3 ; TextBeforeBattle - dw RocketHideout4AfterBattleText3 ; TextAfterBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - dw RocketHideout4EndBattleText3 ; TextEndBattle - -RocketHideout4TrainerHeader3: ; 4552d (11:552d) +RocketHideout4TrainerHeaders: +RocketHideout4TrainerHeader0: dbEventFlagBit EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 - db ($1 << 4) ; trainer's view range + db ($1 << 4) dwEventFlagAddress EVENT_BEAT_ROCKET_HIDEOUT_4_TRAINER_3 - dw RocketHideout4BattleText4 ; TextBeforeBattle - dw RocketHideout4AfterBattleText4 ; TextAfterBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - dw RocketHideout4EndBattleText4 ; TextEndBattle - + dw RocketHideout4Trainer0BeforeText ; 4581d + dw RocketHideout4Trainer0AfterText ; 4583a + dw RocketHideout4Trainer0EndBattleText ; 45822 + dw RocketHideout4Trainer0EndBattleText ; 45822 db $ff -RocketHideout4Text1: ; 4553a (11:553a) +RocketHideout4Text1: +RocketHideout4Text2: + db "@" + +RocketHideout4Text10: + TX_FAR _RocketHideoutJessieJamesText1 + TX_ASM + ld c, 10 + call DelayFrames + ld a, $8 + ld [wPlayerMovingDirection], a + ld a, $0 + ld [wEmotionBubbleSpriteIndex], a + ld a, $0 + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld c, 20 + call DelayFrames + jp TextScriptEnd + +RocketHideout4Text11: + TX_FAR _RocketHideoutJessieJamesText2 + db "@" + +RocketHideout4JessieJamesEndBattleText: + TX_FAR _RocketHideoutJessieJamesText3 + db "@" + +RocketHideout4Text12: + TX_FAR _RocketHideoutJessieJamesText4 + TX_ASM + ld c, 64 + call DelayFrames + jp TextScriptEnd + +RocketHideout4Text0: TX_ASM CheckEvent EVENT_BEAT_ROCKET_HIDEOUT_GIOVANNI - jp nz, .asm_545571 - ld hl, RocketHideout4Text_4557a + jp nz, .asm_457fb + ld hl, RocketHideout4Text_45804 call PrintText ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, RocketHideout4Text_4557f - ld de, RocketHideout4Text_4557f + ld hl, RocketHideout4Text_45809 + ld de, RocketHideout4Text_45809 call SaveEndBattleTextPointers - ld a, [H_SPRITEINDEX] + ld a, [hSpriteIndexOrTextID] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters @@ -135,87 +366,52 @@ RocketHideout4Text1: ; 4553a (11:553a) ld a, $3 ld [W_ROCKETHIDEOUT4CURSCRIPT], a ld [W_CURMAPSCRIPT], a - jr .asm_209f0 -.asm_545571 - ld hl, RocketHideout4Text10 + jr .asm_45801 + +.asm_457fb + ld hl, RocketHideout4Text9 call PrintText -.asm_209f0 +.asm_45801 jp TextScriptEnd -RocketHideout4Text_4557a: ; 4557a (11:557a) +RocketHideout4Text_45804: TX_FAR _RocketHideout4Text_4557a db "@" -RocketHideout4Text_4557f: ; 4557f (11:557f) +RocketHideout4Text_45809: TX_FAR _RocketHideout4Text_4557f db "@" -RocketHideout4Text10: ; 45584 (11:5584) +RocketHideout4Text9: TX_FAR _RocketHideout4Text_45584 db "@" -RocketHideout4Text2: ; 45589 (11:5589) +RocketHideout4Text3: TX_ASM ld hl, RocketHideout4TrainerHeader0 call TalkToTrainer jp TextScriptEnd -RocketHideout4BattleText2: ; 45593 (11:5593) - TX_FAR _RocketHideout4BattleText2 - db "@" - -RocketHideout4EndBattleText2: ; 45598 (11:5598) - TX_FAR _RocketHideout4EndBattleText2 - db "@" - -RocketHideout4AfterBattleText2: ; 4559d (11:559d) - TX_FAR _RocketHide4AfterBattleText2 - db "@" - -RocketHideout4Text3: ; 455a2 (11:55a2) - TX_ASM - ld hl, RocketHideout4TrainerHeader2 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout4BattleText3: ; 455ac (11:55ac) - TX_FAR _RocketHideout4BattleText3 - db "@" - -RocketHideout4EndBattleText3: ; 455b1 (11:55b1) - TX_FAR _RocketHideout4EndBattleText3 - db "@" - -RocketHideout4AfterBattleText3: ; 455b6 (11:55b6) - TX_FAR _RocketHide4AfterBattleText3 - db "@" - -RocketHideout4Text4: ; 455bb (11:55bb) - TX_ASM - ld hl, RocketHideout4TrainerHeader3 - call TalkToTrainer - jp TextScriptEnd - -RocketHideout4BattleText4: ; 455c5 (11:55c5) +RocketHideout4Trainer0BeforeText: TX_FAR _RocketHideout4BattleText4 db "@" -RocketHideout4EndBattleText4: ; 455ca (11:55ca) +RocketHideout4Trainer0EndBattleText: TX_FAR _RocketHideout4EndBattleText4 - db "@" - -RocketHideout4AfterBattleText4: ; 455cf (11:55cf) + TX_BUTTON_SOUND TX_ASM - ld hl, RocketHideout4Text_455ec - call PrintText - CheckAndSetEvent EVENT_ROCKET_DROPPED_LIFT_KEY - jr nz, .asm_455e9 + SetEvent EVENT_ROCKET_DROPPED_LIFT_KEY ld a, HS_ROCKET_HIDEOUT_4_ITEM_5 ld [wMissableObjectIndex], a predef ShowObject -.asm_455e9 jp TextScriptEnd -RocketHideout4Text_455ec: ; 455ec (11:55ec) +RocketHideout4Trainer0AfterText: + TX_ASM + ld hl, RocketHideout4Text_45844 + call PrintText + jp TextScriptEnd + +RocketHideout4Text_45844: TX_FAR _RocketHideout4Text_455ec db "@" -- cgit v1.3.1-sl0p