diff options
| -rw-r--r-- | constants/misc_constants.asm | 3 | ||||
| -rwxr-xr-x | data/mapObjects/celadongamecorner.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rw-r--r-- | engine/bank3c.asm | 17 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rw-r--r-- | maps/celadongamecorner.blk | 2 | ||||
| -rwxr-xr-x | scripts/celadongamecorner.asm | 23 |
8 files changed, 43 insertions, 18 deletions
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" @@ -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 |