diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | engine/battle/battle_transitions.asm | 8 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 6 | ||||
| -rwxr-xr-x | engine/gamefreak.asm | 8 | ||||
| -rwxr-xr-x | engine/hall_of_fame.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/healing_machine.asm | 6 | ||||
| -rwxr-xr-x | engine/palettes.asm | 243 | ||||
| -rw-r--r-- | home.asm | 46 | ||||
| -rw-r--r-- | home/fade.asm | 18 | ||||
| -rw-r--r-- | replace.sh | 3 | ||||
| -rwxr-xr-x | wram.asm | 34 |
11 files changed, 188 insertions, 189 deletions
@@ -42,6 +42,9 @@ *.sn9 *.sn0 +# replace.sh +replace.sh + # leftover txt files from diff *.txt diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 2ff681dd..c5c4ffbe 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -196,9 +196,9 @@ BattleTransition_BlackScreen: ; 70ad3 (1c:4ad3) ld [rBGP], a ld [rOBP0], a ld [rOBP1], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret ; for non-dungeon trainer battles @@ -362,7 +362,7 @@ BattleTransition_FlashScreen_: ; 70be8 (1c:4be8) cp $1 jr z, .done ld [rBGP], a - call Func_3021 + call UpdateGBCPal_BGP ld c, $2 call DelayFrames jr .loop diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 719fcf0a..67ed3247 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -2,7 +2,7 @@ MarowakAnim: ; 7092b (1c:492b) ; animate the ghost being unveiled as a Marowak ld a, $e4 ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 call CopyMonPicFromBGToSpriteVRAM ; cover the BG ghost pic with a sprite ghost pic that looks the same ; now that the ghost pic is being displayed using sprites, clear the ghost pic from the BG tilemap coord hl, 12, 0 @@ -28,7 +28,7 @@ MarowakAnim: ; 7092b (1c:492b) sla a sla a ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 jr nz, .fadeOutGhostLoop call ClearSprites call CopyMonPicFromBGToSpriteVRAM ; copy Marowak pic from BG to sprite VRAM @@ -42,7 +42,7 @@ MarowakAnim: ; 7092b (1c:492b) srl b rra ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld a, b and a jr nz, .fadeInMarowakLoop diff --git a/engine/gamefreak.asm b/engine/gamefreak.asm index acbd5fc9..a5c0edef 100755 --- a/engine/gamefreak.asm +++ b/engine/gamefreak.asm @@ -3,8 +3,8 @@ LoadShootingStarGraphics: ; 70000 (1c:4000) ld [rOBP0], a ld a, $a4 ld [rOBP1], a ; $ff49 - call Func_3040 - call Func_3061 + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ld de, AnimationTileset2 ; $4757 ; star tile (top left quadrant) ld hl, vChars1 + $200 lb bc, BANK(AnimationTileset2), $01 @@ -77,7 +77,7 @@ AnimateShootingStar: ; 7004a (1c:404a) ld hl, rOBP0 ; $ff48 rrc [hl] rrc [hl] - call Func_3040 + call UpdateGBCPal_OBP0 ld c, 10 call CheckForUserInterruption ret c @@ -223,7 +223,7 @@ MoveDownSmallStars: ; 70142 (1c:4142) ld a, [rOBP1] ; $ff49 xor %10100000 ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 ld c, 3 call CheckForUserInterruption ret c diff --git a/engine/hall_of_fame.asm b/engine/hall_of_fame.asm index d8ca2d2b..cf7a3caa 100755 --- a/engine/hall_of_fame.asm +++ b/engine/hall_of_fame.asm @@ -121,7 +121,7 @@ HoFShowMonOrPlayer: ; 702a2 (1c:42a2) call RunPaletteCommand ld a, %11100100 ld [rBGP], a - call Func_3021 + call UpdateGBCPal_BGP ld c, $31 ; back pic call HoFLoadMonPlayerPicTileIDs ld d, $a0 diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm index 320cda73..daaf33b2 100755 --- a/engine/overworld/healing_machine.asm +++ b/engine/overworld/healing_machine.asm @@ -12,7 +12,7 @@ AnimateHealingMachine: ; 7048b (1c:448b) push af ld a, $e0 ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 ld hl, wOAMBuffer + $84 ld de, PokeCenterOAMData ; $44d7 call CopyHealingMachineOAM @@ -54,7 +54,7 @@ AnimateHealingMachine: ; 7048b (1c:448b) call DelayFrames pop af ld [rOBP1], a ; $ff49 - call Func_3061 + call UpdateGBCPal_OBP1 pop hl pop af ld [hl], a @@ -79,7 +79,7 @@ FlashSprite8Times: ; 70547 (1c:4547) ld a, [rOBP1] xor d ld [rOBP1], a - call Func_3061 + call UpdateGBCPal_OBP1 ld c, 10 call DelayFrames dec b diff --git a/engine/palettes.asm b/engine/palettes.asm index 2668236a..8182315c 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -334,13 +334,13 @@ Func_720bd:: ; 720bd (1c:60bd) ld a,[hli] call Func_723fe ld a,e - ld [wdee4],a + ld [wPalDataPointer2],a ld a,d - ld [wdee5],a + ld [wPalDataPointer2+1],a xor a - call Func_7240f + call UpdatePalData ld a,$1 - call Func_72470 + call TransferCurBGPData ret Func_720e3:: ; 720e3 (1c:60e3) @@ -663,7 +663,7 @@ CopyGfxToSuperNintendoVRAM: ; 722d7 (1c:62d7) call DisableLCD ld a, $e4 ld [rBGP], a ; $ff47 - call Func_72520 + call _UpdateGBCPal_BGP_CheckDMG ld de, vChars1 ld a, [wCopyingSGBTileData] and a @@ -694,7 +694,7 @@ CopyGfxToSuperNintendoVRAM: ; 722d7 (1c:62d7) call Func_721b4 xor a ld [rBGP], a ; $ff47 - call Func_72520 + call _UpdateGBCPal_BGP_CheckDMG ei ret @@ -741,22 +741,22 @@ InitGBCPalettes: ; 72346 (1c:6346) push hl call Func_723fe ld a,e - ld [wdee2],a + ld [wPalDataPointer1],a ld a,d - ld [wdee3],a + ld [wPalDataPointer1+1],a xor a - call Func_7240f + call UpdatePalData ld a,$0 - call Func_72470 + call TransferCurBGPData ld a,$1 - call Func_7240f + call UpdatePalData ld a,$0 - call Func_724df + call TransferCurOBPData ld a,$2 - call Func_7240f + call UpdatePalData ld a,$4 - call Func_724df + call TransferCurOBPData pop hl ld a,[hli] @@ -764,22 +764,22 @@ InitGBCPalettes: ; 72346 (1c:6346) push hl call Func_723fe ld a,e - ld [wdee4],a + ld [wPalDataPointer2],a ld a,d - ld [wdee5],a + ld [wPalDataPointer2+1],a xor a - call Func_7240f + call UpdatePalData ld a,$1 - call Func_72470 + call TransferCurBGPData ld a,$1 - call Func_7240f + call UpdatePalData ld a,$1 - call Func_724df + call TransferCurOBPData ld a,$2 - call Func_7240f + call UpdatePalData ld a,$5 - call Func_724df + call TransferCurOBPData pop hl ld a,[hli] @@ -787,44 +787,44 @@ InitGBCPalettes: ; 72346 (1c:6346) push hl call Func_723fe ld a,e - ld [wdee6],a + ld [wPalDataPointer3],a ld a,d - ld [wdee7],a + ld [wPalDataPointer3+1],a xor a - call Func_7240f + call UpdatePalData ld a,$2 - call Func_72470 + call TransferCurBGPData ld a,$1 - call Func_7240f + call UpdatePalData ld a,$2 - call Func_724df + call TransferCurOBPData ld a,$2 - call Func_7240f + call UpdatePalData ld a,$6 - call Func_724df + call TransferCurOBPData pop hl ld a,[hli] inc hl call Func_723fe ld a,e - ld [wdee8],a + ld [wPalDataPointer4],a ld a,d - ld [wdee9],a + ld [wPalDataPointer4+1],a xor a - call Func_7240f + call UpdatePalData ld a,$3 - call Func_72470 + call TransferCurBGPData ld a,$1 - call Func_7240f + call UpdatePalData ld a,$3 - call Func_724df + call TransferCurOBPData ld a,$2 - call Func_7240f + call UpdatePalData ld a,$7 - call Func_724df + call TransferCurOBPData ret @@ -845,62 +845,62 @@ Func_723fe:: ; 723fe (1c:63fe) pop hl ret -Func_7240f:: ; 7240f (1c:640f) +UpdatePalData:: ; 7240f (1c:640f) and a - jr nz,.asm_72419 + jr nz,.notBGP ld a,[rBGP] - ld [wdef2],a - jr .asm_72428 -.asm_72419 + ld [wLastBGP],a + jr .continue +.notBGP dec a - jr nz,.asm_72423 + jr nz,.notOBP0 ld a,[rOBP0] - ld [wdef3],a - jr .asm_72428 -.asm_72423 + ld [wLastOBP0],a + jr .continue +.notOBP0 ld a,[rOBP1] - ld [wdef4],a -.asm_72428 - ld b,a - and $3 - call Func_7246a - ld a,[hli] - ld [wdeea],a + ld [wLastOBP1],a +.continue + ld b,a ; save current GBP shade + and $3 ; get first shade + call GetPaletteShade + ld a,[hli] ; store in palette buffer + ld [wPalDataBuffer1],a ld a,[hl] - ld [wdeeb],a - ld a,b + ld [wPalDataBuffer1+1],a + ld a,b ; get second shade rrca rrca ld b,a and $3 - call Func_7246a - ld a,[hli] - ld [wdeec],a + call GetPaletteShade + ld a,[hli] ; store in second buffer + ld [wPalDataBuffer2],a ld a,[hl] - ld [wdeed],a + ld [wPalDataBuffer2+1],a ld a,b rrca rrca ld b,a and $3 - call Func_7246a + call GetPaletteShade ld a,[hli] - ld [wdeee],a + ld [wPalDataBuffer3],a ld a,[hl] - ld [wdeef],a + ld [wPalDataBuffer3+1],a ld a,b rrca rrca ld b,a and $3 - call Func_7246a + call GetPaletteShade ld a,[hli] - ld [wdef0],a + ld [wPalDataBuffer4],a ld a,[hl] - ld [wdef1],a + ld [wPalDataBuffer4+1],a ret -Func_7246a:: ; 7246a (1c:646a) +GetPaletteShade:: ; 7246a (1c:646a) add a ld l,a xor a @@ -908,7 +908,7 @@ Func_7246a:: ; 7246a (1c:646a) add hl,de ret -Func_72470:: ; 72470 (1c:6470) +TransferCurBGPData:: ; 72470 (1c:6470) push de add a add a @@ -916,37 +916,37 @@ Func_72470:: ; 72470 (1c:6470) or $80 ld [rBGPI],a ld de,rBGPD - ld hl,wdeea - ld b,$2 + ld hl,wPalDataBuffer1 + ld b,%10 ; searching oam STAT mode ld a,[rLCDC] and rLCDC_ENABLE_MASK jr nz,.lcdenabled rept 4 - call Func_7251b + call TransferCurPalDataLCDDisabled endr jr .done .lcdenabled rept 4 - call Func_72511 + call TransferCurPalDataLCDEnabled endr .done pop de ret -Func_724a2:: ; 724a2 (1c:64a2) +WriteCurBGPDataToMainBuffer:: ; 724a2 (1c:64a2) push de add a add a - add a + add a ; get the ath entry with size of 8 bytes (4 pal entries) ld l,a xor a ld h,a - ld de,wdef6 + ld de,wStoredBGPPalettes add hl,de - ld de,wdeea + ld de,wPalDataBuffer1 ld c,$8 .loop - ld a,[de] + ld a,[de] ; copy to main buffer ld [hli],a inc de dec c @@ -974,7 +974,7 @@ TransferPalData: ; 724cc (1c:64cc) or $80 ld [rBGPI], a ld de,rBGPD - ld hl,wdef6 + ld hl,wStoredBGPPalettes ld c,$20 .loop ld a,[hli] @@ -983,7 +983,7 @@ TransferPalData: ; 724cc (1c:64cc) jr nz,.loop ret -Func_724df: ; 724df (1c:64df) +TransferCurOBPData: ; 724df (1c:64df) push de add a add a @@ -991,127 +991,128 @@ Func_724df: ; 724df (1c:64df) or $80 ld [rOBPI],a ld de,rOBPD - ld hl,wdeea - ld b,$2 ; searching oam STAT mode + ld hl,wPalDataBuffer1 + ld b,%10 ; searching oam STAT mode ld a,[rLCDC] and rLCDC_ENABLE_MASK jr nz,.lcdenabled rept 4 - call Func_7251b + call TransferCurPalDataLCDDisabled endr jr .done .lcdenabled rept 4 - call Func_72511 + call TransferCurPalDataLCDEnabled endr .done pop de ret -Func_72511: ; 72511 (1c:6511) +TransferCurPalDataLCDEnabled: ; 72511 (1c:6511) ld a,[rSTAT] and b - jr z,Func_72511 ; wait if either in hblank or vblank period + jr z,TransferCurPalDataLCDEnabled ; wait for non-vblank/hblank period + ; this is a precaution in-case we're nearing the end of vblank/hblank .notinhblank ld a,[rSTAT] and b jr nz,.notinhblank ; wait if transferring oam or data to lcd driver -Func_7251b: ; 7251b (1c:651b) +TransferCurPalDataLCDDisabled: ; 7251b (1c:651b) ld a,[hli] ld [de],a ld a,[hli] ld [de],a ret -Func_72520:: ; 72520 (1c:6520) +_UpdateGBCPal_BGP_CheckDMG:: ; 72520 (1c:6520) ld a,[hGBC] and a ret z ; fallthrough -Func_72524:: ; 72524 (1c:6524) - ld a,[wdee2] +_UpdateGBCPal_BGP:: ; 72524 (1c:6524) + ld a,[wPalDataPointer1] ld e,a - ld a,[wdee3] + ld a,[wPalDataPointer1+1] ld d,a xor a - call Func_7240f + call UpdatePalData ld a,$0 - call Func_724a2 - ld a,[wdee4] + call WriteCurBGPDataToMainBuffer + ld a,[wPalDataPointer2] ld e,a - ld a,[wdee5] + ld a,[wPalDataPointer2+1] ld d,a xor a - call Func_7240f + call UpdatePalData ld a,$1 - call Func_724a2 - ld a,[wdee6] + call WriteCurBGPDataToMainBuffer + ld a,[wPalDataPointer3] ld e,a - ld a,[wdee7] + ld a,[wPalDataPointer3+1] ld d,a xor a - call Func_7240f + call UpdatePalData ld a,$2 - call Func_724a2 - ld a,[wdee8] + call WriteCurBGPDataToMainBuffer + ld a,[wPalDataPointer4] ld e,a - ld a,[wdee9] + ld a,[wPalDataPointer4+1] ld d,a xor a - call Func_7240f + call UpdatePalData ld a,$3 - call Func_724a2 + call WriteCurBGPDataToMainBuffer call PreparePalDataTransfer ret -Func_7256c:: ; 7256c (1c:656c) - ld a,[wdee2] +_UpdateGBCPal_OBP:: ; 7256c (1c:656c) + ld a,[wPalDataPointer1] ld e,a - ld a,[wdee3] + ld a,[wPalDataPointer1+1] ld d,a ld a,c - call Func_7240f + call UpdatePalData ld a,c dec a rlca rlca - call Func_724df - ld a,[wdee4] + call TransferCurOBPData + ld a,[wPalDataPointer2] ld e,a - ld a,[wdee5] + ld a,[wPalDataPointer2+1] ld d,a ld a,c - call Func_7240f + call UpdatePalData ld a,c dec a rlca rlca inc a - call Func_724df - ld a,[wdee6] + call TransferCurOBPData + ld a,[wPalDataPointer3] ld e,a - ld a,[wdee7] + ld a,[wPalDataPointer3+1] ld d,a ld a,c - call Func_7240f + call UpdatePalData ld a,c dec a rlca rlca add $2 - call Func_724df - ld a,[wdee8] + call TransferCurOBPData + ld a,[wPalDataPointer4] ld e,a - ld a,[wdee9] + ld a,[wPalDataPointer4+1] ld d,a ld a,c - call Func_7240f + call UpdatePalData ld a,c dec a rlca rlca add $3 - call Func_724df + call TransferCurOBPData ret Func_725be:: ; 725be (1c:65be) @@ -2324,7 +2324,7 @@ DisplayTextBoxID:: ; 3010 (0:3010) homecall_sf DisplayTextBoxID_ ret -Func_3021:: ; 3021 (0:3021) +UpdateGBCPal_BGP:: ; 3021 (0:3021) push af ld a,[hGBC] and a @@ -2334,11 +2334,11 @@ Func_3021:: ; 3021 (0:3021) push hl ld a,[rBGP] ld b,a - ld a,[wdef2] + ld a,[wLastBGP] cp b - jr z,.asm_303b - callba Func_72524 ; 1c:6524 -.asm_303b + jr z,.noChangeInBGP + callba _UpdateGBCPal_BGP ; 1c:6524 +.noChangeInBGP pop hl pop de pop bc @@ -2346,7 +2346,7 @@ Func_3021:: ; 3021 (0:3021) pop af ret -Func_3040:: ; 3040 (0:3040) +UpdateGBCPal_OBP0:: ; 3040 (0:3040) push af ld a,[hGBC] and a @@ -2356,14 +2356,14 @@ Func_3040:: ; 3040 (0:3040) push hl ld a,[rOBP0] ld b,a - ld a,[wdef3] + ld a,[wLastOBP0] cp b - jr z,.asm_305c - ld b,BANK(Func_7256c) ; 1c:656c - ld hl,Func_7256c + jr z,.noChangeInOBP0 + ld b,BANK(_UpdateGBCPal_OBP) ; 1c:656c + ld hl,_UpdateGBCPal_OBP ld c,$1 call Bankswitch -.asm_305c +.noChangeInOBP0 pop hl pop de pop bc @@ -2371,7 +2371,7 @@ Func_3040:: ; 3040 (0:3040) pop af ret -Func_3061:: ; 3061 (0:3061) +UpdateGBCPal_OBP1:: ; 3061 (0:3061) push af ld a,[hGBC] and a @@ -2381,14 +2381,14 @@ Func_3061:: ; 3061 (0:3061) push hl ld a,[rOBP1] ld b,a - ld a,[wdef4] + ld a,[wLastOBP1] cp b - jr z,.asm_307d - ld b,BANK(Func_7256c) - ld hl,Func_7256c + jr z,.noChangeInOBP1 + ld b,BANK(_UpdateGBCPal_OBP) + ld hl,_UpdateGBCPal_OBP ld c,$2 call Bankswitch -.asm_307d +.noChangeInOBP1 pop hl pop de pop bc @@ -4771,9 +4771,9 @@ GBPalNormal:: ; 3de0 (0:3de0) ld [rBGP], a ld a, %11010000 ; 3100 ld [rOBP0], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret GBPalWhiteOut:: ; 3df2 (0:3df2) @@ -4782,9 +4782,9 @@ GBPalWhiteOut:: ; 3df2 (0:3df2) ld [rBGP],a ld [rOBP0],a ld [rOBP1],a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret diff --git a/home/fade.asm b/home/fade.asm index 166ba9ee..2bdcbf01 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -16,9 +16,9 @@ LoadGBPal:: ; 1e6f (0:1e6f) ld [rOBP0], a ld a, [hli] ld [rOBP1], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ret GBFadeInFromBlack:: ; 1e8f (0:1e8f) @@ -37,9 +37,9 @@ GBFadeIncCommon: ; 1e9b (0:1e9b) ld [rOBP0], a ld a, [hli] ld [rOBP1], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ld c, 8 call DelayFrames dec b @@ -62,9 +62,9 @@ GBFadeDecCommon: ld [rOBP0], a ld a, [hld] ld [rBGP], a - call Func_3021 - call Func_3040 - call Func_3061 + call UpdateGBCPal_BGP + call UpdateGBCPal_OBP0 + call UpdateGBCPal_OBP1 ld c, 8 call DelayFrames dec b diff --git a/replace.sh b/replace.sh new file mode 100644 index 00000000..bc9e2296 --- /dev/null +++ b/replace.sh @@ -0,0 +1,3 @@ +sed -i 's/\<foo\>/bar/' $(git grep -l foo) +# foo: phrase to find +# bar: phrase to replace foo
\ No newline at end of file @@ -3291,27 +3291,19 @@ wBoxMonNicks:: ds NAME_LENGTH * MONS_PER_BOX ; de06 wBoxMonNicksEnd:: ; dee1 wBoxDataEnd:: -wdee2:: ds 1 ; dee1 -wdee3:: ds 1 ; dee2 -wdee4:: ds 1 -wdee5:: ds 1 -wdee6:: ds 1 -wdee7:: ds 1 -wdee8:: ds 1 -wdee9:: ds 1 -wdeea:: ds 1 -wdeeb:: ds 1 -wdeec:: ds 1 -wdeed:: ds 1 -wdeee:: ds 1 -wdeef:: ds 1 -wdef0:: ds 1 -wdef1:: ds 1 -wdef2:: ds 1 -wdef3:: ds 1 -wdef4:: ds 1 -wdef5:: ds 1 -wdef6:: ds 1 +wPalDataPointer1:: ds 2 ; dee1 +wPalDataPointer2:: ds 2 ; dee3 +wPalDataPointer3:: ds 2 ; dee5 +wPalDataPointer4:: ds 2 ; dee7 +wPalDataBuffer1:: ds 2 ; dee9 +wPalDataBuffer2:: ds 2 ; deeb +wPalDataBuffer3:: ds 2 ; deed +wPalDataBuffer4:: ds 2 ; deef +wLastBGP:: ds 1 ; def1 +wLastOBP0:: ds 1 ; def2 +wLastOBP1:: ds 1 ; def3 +wdef5:: ds 1 ; def4 +wStoredBGPPalettes:: ds 1 ; def5 SECTION "Stack", WRAMX[$dfff], BANK[1] wStack:: ; dfff |