diff options
| -rw-r--r-- | constants/gfx_constants.asm | 1 | ||||
| -rw-r--r-- | constants/text_constants.asm | 2 | ||||
| -rw-r--r-- | constants/wram_constants.asm | 3 | ||||
| -rw-r--r-- | engine/menu/main_menu.asm | 185 | ||||
| -rw-r--r-- | shim.sym | 7 | ||||
| -rw-r--r-- | wram.asm | 5 |
6 files changed, 107 insertions, 96 deletions
diff --git a/constants/gfx_constants.asm b/constants/gfx_constants.asm index 536f4a4..52f74e5 100644 --- a/constants/gfx_constants.asm +++ b/constants/gfx_constants.asm @@ -35,6 +35,7 @@ HP_YELLOW EQU 1 HP_RED EQU 2 SPRITEBUFFERSIZE EQU 7*7 * 8 ; 7 * 7 (tiles) * 8 (bytes per tile) +DOUBLESPRITEBUFFERSIZE EQU 2*SPRITEBUFFERSIZE ; sprite_oam_struct members (see macros/wram.asm) const_def diff --git a/constants/text_constants.asm b/constants/text_constants.asm index f899ea3..e487d4c 100644 --- a/constants/text_constants.asm +++ b/constants/text_constants.asm @@ -1,6 +1,6 @@ ; name lengths NAME_LENGTH EQU 11 ; English -PLAYER_NAME_LENGTH EQU 8 ; English +PLAYER_NAME_LENGTH EQU 6 ; Japanese BOX_NAME_LENGTH EQU 9 ; English MON_NAME_LENGTH EQU 6 MOVE_NAME_LENGTH EQU 13 ; English diff --git a/constants/wram_constants.asm b/constants/wram_constants.asm index 381bdeb..4b63ba7 100644 --- a/constants/wram_constants.asm +++ b/constants/wram_constants.asm @@ -9,4 +9,5 @@ NUM_DIRECTIONS EQU const_value const_def const DEBUG_BATTLE_F - const DEBUG_FIELD_F
\ No newline at end of file + const DEBUG_FIELD_F + const CONTINUED_F
\ No newline at end of file diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index 320df82..1f4a9e1 100644 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -39,7 +39,7 @@ MainMenu:: ; 01:53CC jp CallJumptable MainMenuHeader: ; 01:5418 - db $40 + db MENU_BACKUP_TILES menu_coords 0, 0, 13, 7 dw .MenuData db 1 ; default option @@ -110,11 +110,11 @@ MainMenuOptionContinue:: ;547C jp nz, MainMenu jr .loop .escape - call $5397 ; todo - call $53B0 ; todo + call Function5397 + call Function53b0 ld hl, wDebugFlags res DEBUG_FIELD_F, [hl] - set 2, [hl] + set CONTINUED_F, [hl] set 3, [hl] ldh a, [hJoyState] bit SELECT_F, a @@ -125,7 +125,7 @@ MainMenuOptionContinue:: ;547C call ClearTileMap ld c, $0A call DelayFrames - jp OverworldStart ; todo + jp OverworldStart DisplayContinueGameInfo:: ; 54BF xor a @@ -209,50 +209,50 @@ StartNewGame:: ; 555C jp IntroCleanup DemoStart:: ; 558D - ld de, $4BD4 ; maybe this should be a macro - b is bank, de is address, c is flag - ld bc, $1200 + ld de, OakPic + lb bc, BANK(OakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, OakSpeechDemo call PrintText call RotateThreePalettesRight call ClearTileMap - ld de, $4D10 - ld bc, $1200 + ld de, ProtagonistPic + lb bc, BANK(ProtagonistPic), $00 call IntroDisplayPicCenteredOrUpperRight call MovePicLeft - ld a, $D0 ; todo + ld a, %11010000 ldh [rOBP0], a call DemoSetUpPlayer jp IntroCleanup GameStart:: ; 55BB - ld de, $4BD4 - ld bc, $1200 + ld de, OakPic + lb bc, BANK(OakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, OakSpeech1 call PrintText call RotateThreePalettesRight call ClearTileMap - ld a, $C8 ; pokemon preview ID - ld [$CB5B], a - ld [$CD78], a + ld a, DEX_YADOKING + ld [wCurSpecies], a + ld [wMonDexIndex], a call GetMonHeader - ld hl, $C2F6 + ld hl, $C2F6 ; tilemap coord ld hl, $C2F6 call PrepMonFrontpic call MovePicLeft ld hl, OakSpeech2 call PrintText - ld a, $C8 ; this should be a constant methinks + ld a, DEX_YADOKING call PlayCry ld hl, OakSpeech3 call PrintText call RotateThreePalettesRight call ClearTileMap - ld de, $4D10 - ld bc, $1200 + ld de, ProtagonistPic + lb bc, BANK(ProtagonistPic), $00 call IntroDisplayPicCenteredOrUpperRight call MovePicLeft ld hl, OakSpeech4 @@ -260,8 +260,8 @@ GameStart:: ; 55BB call ChoosePlayerName call RotateThreePalettesRight call ClearTileMap - ld de, $4ab7 - ld bc, $1200 + ld de, RivalPic + lb bc, BANK(RivalPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, OakSpeech5 @@ -269,8 +269,8 @@ GameStart:: ; 55BB call ChooseRivalName call RotateThreePalettesRight call ClearTileMap - ld de, $4BD4 - ld bc, $1200 + ld de, OakPic + lb bc, BANK(OakPic), $00 call IntroDisplayPicCenteredOrUpperRight call FadeInIntroPic ld hl, OakSpeech6 @@ -279,8 +279,8 @@ GameStart:: ; 55BB call Function04ac call RotateThreePalettesRight call ClearTileMap - ld de, $4D10 - ld bc, $1200 + ld de, ProtagonistPic + lb bc, BANK(ProtagonistPic), $00 call IntroDisplayPicCenteredOrUpperRight call RotateThreePalettesLeft ld hl, OakSpeech7 @@ -302,23 +302,23 @@ GameStart:: ; 55BB call DelayFrames IntroCleanup:: ; 568E - ld de, $4743 - ld bc, $0400 + ld de, ShrinkPic1 + lb bc, BANK(ShrinkPic1), $00 call IntroDisplayPicCenteredOrUpperRight ld c, $04 call DelayFrames - ld de, $479D - ld bc, $0400 + ld de, ShrinkPic2 + lb bc, BANK(ShrinkPic2), $00 call IntroDisplayPicCenteredOrUpperRight ld c, $14 call DelayFrames - ld hl, $C30A + hlcoord 6, 5 ld b, $07 ld c, $07 call ClearBox ld c, $14 call DelayFrames - call $5D5D + call LoadStartingSprites call LoadFontExtra ld c, $32 call DelayFrames @@ -332,7 +332,7 @@ IntroCleanup:: ; 568E OverworldStart:: call SetUpGameEntry ld hl, wDebugFlags - bit 2, [hl] ; ? + bit CONTINUED_F, [hl] call z, Function15b5 ld hl, wd4a9 set 0, [hl] @@ -344,7 +344,7 @@ SetUpGameEntry:: ; 56E8 ld a, $F2 ldh [hMapEntryMethod], a ld hl, wDebugFlags - bit 2, [hl] ; ? + bit CONTINUED_F, [hl] ; if we loaded a game ret nz ld a, $F1 ldh [hMapEntryMethod], a @@ -352,14 +352,14 @@ SetUpGameEntry:: ; 56E8 ld [wDebugWarpSelection], a ld hl, GameStartPlacement ld de, wMapGroup - ld bc, $0008 + ld bc, wd65e - wMapGroup call CopyBytes ret GameStartPlacement:: ; 570D db $01 ; map group - db $09 ; map - dw $C633 ; screen anchor - should be coords + db PLAYER_HOUSE_2F+1 ; map + dwcoord 15, 45 ; screen anchor db $04 ; metatile x db $04 ; metatile y db $00 ; in-metatile x @@ -378,7 +378,7 @@ DebugSetUpPlayer:: ; 5715 ld [wd164], a call GiveRandomJohto ld a, $03 - call Function57eb + call AddRandomPokemonToBox call FillTMs ld de, DebugBagItems call FillBagWithList @@ -388,7 +388,7 @@ DebugSetUpPlayer:: ; 5715 call DebugFillPokedex ld hl, wAnnonDex ld [hl], $01 - call $40FD ; todo + call Function40fd ret DebugFillPokedex:: ; 5755 @@ -440,12 +440,12 @@ DebugBagItems:: ; 5777 db ITEM_DETECT_ORB, $63 db $FF -Function57A0 ; 57A0 +GiveRandomPokemon:: ; 57A0 and a ret z .loop push af - call RandomOver246 + call RandomUnder246 ld b, $0A call GivePokemon pop af @@ -489,18 +489,18 @@ GivePokemon:: ; 57DE call Predef ret -Function57eb ; 57EB +AddRandomPokemonToBox: ; 57EB and a ret z .loop push af xor a ld [wca44], a - call RandomOver246 + call RandomUnder246 ld [wcdd7], a ld a, $05 ld [wCurPartyLevel], a - callab Function3e043 + callab AddPokemonToBox ld a, [wcdd7] ld [wMonDexIndex], a callab Functiondd5c @@ -509,7 +509,7 @@ Function57eb ; 57EB jr nz, .loop ret -RandomOver246:: ; 5818 +RandomUnder246:: ; 5818 .loop call Random and a @@ -557,7 +557,7 @@ DemoSetUpPlayer:: ; 5849 ld hl, wRivalName ld de, DemoRivalName call CopyString - call $40FD + call Function40fd ld de, DemoItemList call FillBagWithList call GiveRandomJohto @@ -676,7 +676,7 @@ SetPlayerNamesDebug:: ; 5B07 ld de, wRivalName CopyNameDebug: - ld bc, 0006 ; constant - name length + ld bc, PLAYER_NAME_LENGTH call CopyBytes ret @@ -724,21 +724,17 @@ ChoosePlayerNameEndText: ; 5B6F prompt PlayerNameMenuHeader: ; 5B81 - db $40 + db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw $5B89 db 01 ; initial selection ; 5B89 - db "ツオ゛じぶんできめる@" - -; 5B93 + db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B + db 04 ; items + db "じぶんできめる@" db "ゴールド@" - -; 5B98 db "サトシ@" - -; 5B9C db "ジャック@" ; 5BA1 @@ -782,27 +778,17 @@ ChooseRivalNameEndText: ; 5BF3 prompt RivalNameMenuHeader: ; 5C0A - db $40 + db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw RivalNameMenuData db 01 ; initial selection RivalNameMenuData: ; 5C12 - db $91 + db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B db 04 ; items - dw $3C2C - db $DE, $33 - dw $D2B7 - - db $D9, $50 - -; 5C1C + db "じぶんできめる@" db "シルバー@" - -; 5C21 db "シゲル@" - -; 5C25 db "ジョン@" ; 5C29 @@ -836,28 +822,17 @@ MomNamePrompt:: ; 5C31 ret MomNameMenuHeader: ; 5C71 - db $40 ; flags + db MENU_BACKUP_TILES ; flags menu_coords 00, 00, 10, 11 dw .MomNameMenuData db 01 ; initial selection .MomNameMenuData: ; 5C79 - db $91 + db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B db 04 ; items - dw $3C2C - db $DE, $33 - dw $B77F - -; 5C81 - db "める@" - -; 5C84 + db "じぶんで きめる@" db "おかあさん@" - -; 5C8A db "ママ@" - -; 5C8D db "かあちゃん@" ; 5C93 @@ -875,12 +850,12 @@ NamingWindow:: ; 5C9B SaveCustomName:: ; 5CAC ld hl, wcd31 - ld bc, $0006 ; constant, player name length + ld bc, PLAYER_NAME_LENGTH call CopyBytes ret PanPortraitRight:: ; 5CB6 - ld hl, $C2F5 ; should be a hlcoord i think + hlcoord 5, 4 ld d, $06 ld e, $7E ld b, d @@ -909,7 +884,7 @@ PanPortraitRight:: ; 5CB6 ret PanPortraitLeft:: ; 5CD7 - ld hl, $C2FC ; hlcoord + hlcoord 12, 4 ld b, $06 ld c, $7E .loop @@ -987,20 +962,48 @@ IntroDisplayPicCenteredOrUpperRight:: ; 5D27 call UncompressSpriteFromDE ld a, $00 call OpenSRAM - ld hl, $A188 - ld de, $A000 - ld bc, $0310 + ld hl, sSpriteBuffer1 + ld de, sSpriteBuffer0 + ld bc, DOUBLESPRITEBUFFERSIZE call CopyBytes call CloseSRAM - ld de, $9000 + ld de, VRAM_Begin + $1000 call InterlaceMergeSpriteBuffers pop hl xor a ldh [hGraphicStartTile], a ld bc, $0707 - ; ld a, $1F - ; call Predef predef PlaceGraphic ret -; 5D5D
\ No newline at end of file +LoadStartingSprites: ; 5D5D + ld de, GoldSpriteGFX + lb bc, BANK(GoldSpriteGFX), $0C + ld hl, VRAM_Begin + call Request2bpp + ld hl, wVirtualOAM + ld de, GameStartSprites + ld c, $04 +.loop + ld a, [de] + inc de + ld [hl+], a + ld a, [de] + inc de + ld [hl+], a + ld a, [de] + inc de + ld [hl+], a + xor a + ld [hl+], a + dec c + jr nz, .loop + ret + +GameStartSprites: ; 5D80 + db $50, $48, $00 + db $50, $50, $01 + db $58, $48, $02 + db $58, $50, $03 + +; 5D8C
\ No newline at end of file @@ -1,12 +1,15 @@ ; ROM0 00:3CA8 InitSpriteAnimStruct +01:40FD Function40fd 01:5007 Function5007 01:50B9 Function50b9 01:5190 _UpdateSprites 01:5190 Function5190 01:52F9 Function52f9 01:5388 Function5388 +01:5397 Function5397 +01:53B0 Function53b0 01:63D8 ReanchorBGMap_NoOAMUpdate 01:6437 LoadFonts_NoOAMUpdate 01:6445 Function6445 @@ -62,6 +65,8 @@ 03:5F7D Functiondf7d 03:5F91 Functiondf91 +04:4743 ShrinkPic1 +04:479D ShrinkPic2 04:528F Function1128f 04:52C1 Function112c1 04:530A Function1130a @@ -125,7 +130,7 @@ 0F:508C Function3d08c 0F:55CE Function3d5ce 0F:567C Function3d67c -0F:6043 Function3e043 +0F:6043 AddPokemonToBox 0F:61A4 Function3e1a4 0F:6874 Function3e874 0F:691E Function3e91e @@ -591,8 +591,9 @@ wTextBoxFlags:: db ; ce62 wDebugFlags:: db ; ce63 ; 76543210 -; |\- debug battle indicator -; \-- debug field indicator +; \/|\- debug battle indicator +; | \-- debug field indicator +; \---- loaded/continued game SECTION "Player And Mom Names", WRAM0[$CE67] wPlayerName:: ds 6 ; ce67 |