From d2fd9503da799885ba73357638e6ccbb8a3226a2 Mon Sep 17 00:00:00 2001 From: libjet Date: Thu, 21 Jan 2021 14:37:20 +0000 Subject: Update to RGBDS 0.4.2 --- README.md | 3 --- audio/engine_0f.asm | 4 ++-- audio/engine_10.asm | 4 ++-- audio/engine_11.asm | 4 ++-- audio/engine_12.asm | 4 ++-- audio/engine_13.asm | 4 ++-- data/queued_tiledata/billboard.asm | 4 ++-- engine/pinball_game/draw_sprites/draw_red_field_sprites.asm | 2 +- .../object_collision/red_stage_resolve_collision.asm | 2 +- engine/pokedex.asm | 10 +++++----- home.asm | 12 ++++++------ home/serial.asm | 4 ++-- 12 files changed, 27 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index b3c3d92..d602fd7 100644 --- a/README.md +++ b/README.md @@ -33,8 +33,5 @@ Other disassembly projects: [pokeruby]: https://github.com/pret/pokeruby [pokefirered]: https://github.com/pret/pokefirered [pokeemerald]: https://github.com/pret/pokeemerald -[docs]: https://pret.github.io/pokecrystal/ -[wiki]: https://github.com/pret/pokecrystal/wiki -[tutorials]: https://github.com/pret/pokecrystal/wiki/Tutorials [discord]: https://discord.gg/d5dubZ3 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret diff --git a/audio/engine_0f.asm b/audio/engine_0f.asm index b4376d4..cd18500 100644 --- a/audio/engine_0f.asm +++ b/audio/engine_0f.asm @@ -256,7 +256,7 @@ PlayCry_BankF: ; 0x3c0f0 call Func_3cb15 ret -Unused_3c17c; ; 0x3c17c +Unused_3c17c: ; 0x3c17c ; ??? db $CD, $2E, $45, $CA @@ -3691,7 +3691,7 @@ SoundEffect50_Channel4_BankF: ; 0x3ecba dutycycle $00 soundeffect_note $01, $91, $96, $07 SoundEffect50_Channel4_loop_BankF: ; 0x3ecc0 -_BankF soundeffect_note $03, $F1, $C6, $07 + soundeffect_note $03, $F1, $C6, $07 loopchannel $02, SoundEffect50_Channel4_loop_BankF soundeffect_note $0A, $C1, $C6, $07 soundeffect_note $01, $00, $00, $00 diff --git a/audio/engine_10.asm b/audio/engine_10.asm index 08dabd2..5ea9ae0 100644 --- a/audio/engine_10.asm +++ b/audio/engine_10.asm @@ -251,7 +251,7 @@ PlayCry_Bank10: call Func_40b15 ret -Unused_4017c; ; 0x4017c +Unused_4017c: ; 0x4017c ; ??? db $EE, $CD, $51, $30 @@ -3682,7 +3682,7 @@ SoundEffect50_Channel4_Bank10: dutycycle $00 soundeffect_note $01, $91, $96, $07 SoundEffect50_Channel4_loop_Bank10: -_Bank10 soundeffect_note $03, $F1, $C6, $07 + soundeffect_note $03, $F1, $C6, $07 loopchannel $02, SoundEffect50_Channel4_loop_Bank10 soundeffect_note $0A, $C1, $C6, $07 soundeffect_note $01, $00, $00, $00 diff --git a/audio/engine_11.asm b/audio/engine_11.asm index 7d04f53..1577871 100644 --- a/audio/engine_11.asm +++ b/audio/engine_11.asm @@ -251,7 +251,7 @@ PlayCry_Bank11: call Func_44b15 ret -Unused_4417c; ; 0x4017c +Unused_4417c: ; 0x4017c ; ??? db $87, $56, $BF, $56 @@ -3680,7 +3680,7 @@ SoundEffect50_Channel4_Bank11: dutycycle $00 soundeffect_note $01, $91, $96, $07 SoundEffect50_Channel4_loop_Bank11: -_Bank11 soundeffect_note $03, $F1, $C6, $07 + soundeffect_note $03, $F1, $C6, $07 loopchannel $02, SoundEffect50_Channel4_loop_Bank11 soundeffect_note $0A, $C1, $C6, $07 soundeffect_note $01, $00, $00, $00 diff --git a/audio/engine_12.asm b/audio/engine_12.asm index 9623f0c..ed98b9c 100644 --- a/audio/engine_12.asm +++ b/audio/engine_12.asm @@ -251,7 +251,7 @@ PlayCry_Bank12: call Func_48b15 ret -Unused_4817c; ; 0x4017c +Unused_4817c: ; 0x4017c ; ??? db $7D, $1B, $9F, $72 @@ -3680,7 +3680,7 @@ SoundEffect50_Channel4_Bank12: dutycycle $00 soundeffect_note $01, $91, $96, $07 SoundEffect50_Channel4_loop_Bank12: -_Bank12 soundeffect_note $03, $F1, $C6, $07 + soundeffect_note $03, $F1, $C6, $07 loopchannel $02, SoundEffect50_Channel4_loop_Bank12 soundeffect_note $0A, $C1, $C6, $07 soundeffect_note $01, $00, $00, $00 diff --git a/audio/engine_13.asm b/audio/engine_13.asm index ebacaf3..4eebdda 100644 --- a/audio/engine_13.asm +++ b/audio/engine_13.asm @@ -251,7 +251,7 @@ PlayCry_Bank13: call Func_4cb15 ret -Unused_4c17c; ; 0x4017c +Unused_4c17c: ; 0x4017c ; ??? db $C1, $41, $52, $00 @@ -3676,7 +3676,7 @@ SoundEffect50_Channel4_Bank13: dutycycle $00 soundeffect_note $01, $91, $96, $07 SoundEffect50_Channel4_loop_Bank13: -_Bank13 soundeffect_note $03, $F1, $C6, $07 + soundeffect_note $03, $F1, $C6, $07 loopchannel $02, SoundEffect50_Channel4_loop_Bank13 soundeffect_note $0A, $C1, $C6, $07 soundeffect_note $01, $00, $00, $00 diff --git a/data/queued_tiledata/billboard.asm b/data/queued_tiledata/billboard.asm index 452a9ec..3578f95 100755 --- a/data/queued_tiledata/billboard.asm +++ b/data/queued_tiledata/billboard.asm @@ -38,7 +38,7 @@ PalletTownBillboardTileDataList: ; 0x302b0 dw PalletTownBillboardTileData7 dw PalletTownBillboardTileData8 -ViridianCityBillboardTileDataList +ViridianCityBillboardTileDataList: db $08 dw ViridianCityBillboardTileData1 dw ViridianCityBillboardTileData2 @@ -1492,7 +1492,7 @@ HurryUp2OnBillboardTileData2: ; 0x30a25 db Bank(HurryUp2OnPic) db $00 -HurryUp2OnBillboardTileData3 ; 0x30a2f +HurryUp2OnBillboardTileData3: ; 0x30a2f dw Func_11d2 db $30, $03 dw vTilesSH tile $16 diff --git a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm index d2c4674..6455eea 100644 --- a/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm +++ b/engine/pinball_game/draw_sprites/draw_red_field_sprites.asm @@ -534,7 +534,7 @@ EvolutionTrinketOAMOffsets_RedFieldTop: db $59, $7A db $71, $7A -EvolutionTrinketOAMOffsets_RedFieldBottom +EvolutionTrinketOAMOffsets_RedFieldBottom: ; x, y offsets db $3D, $13 db $5B, $13 diff --git a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm index 397be8c..84867d6 100644 --- a/engine/pinball_game/object_collision/red_stage_resolve_collision.asm +++ b/engine/pinball_game/object_collision/red_stage_resolve_collision.asm @@ -1020,7 +1020,7 @@ ResolveBallUpgradeTriggersCollision_RedField: ; 0x1535d call UpdatePinballUpgradeBlinkingAnimation_RedField ret z -LoadPinballUpgradeTriggersGraphics_RedField +LoadPinballUpgradeTriggersGraphics_RedField: ; Loads the on or off graphics for each of the 3 pinball upgrade trigger dots, depending on their current toggle state. ld a, [wStageCollisionState] bit 0, a diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 2bb3cfb..f3d95a9 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1896,10 +1896,10 @@ Func_28cd4: ; 0x28cd4 cp [hl] ret z ld [hl], a - ld de, .Data_28ce0 - jr asm_28d1d + ld de, .data_28ce0 + jr Func_28d1d -.Data_28ce0: ; 0x28ce0 +.data_28ce0: ; 0x28ce0 db $0 db $1 db $2 @@ -1932,7 +1932,7 @@ Func_28cf8: ; 0x28cf8 ret z ld [hl], a ld de, .data_28d05 - jr asm_28d1d + jr Func_28d1d .data_28d05 db $fe @@ -1960,7 +1960,7 @@ Func_28cf8: ; 0x28cf8 db $fe db $fe -asm_28d1d +Func_28d1d: hlCoord 1, 3, vBGMap ld b, $4 .asm_28d22 diff --git a/home.asm b/home.asm index 7c9fdfd..898d713 100644 --- a/home.asm +++ b/home.asm @@ -1020,7 +1020,7 @@ INCLUDE "home/save.asm" StatIntrNothing: ; 0xfbc jp StatIntrDone -StatIntrTogglePinballWindow +StatIntrTogglePinballWindow: ; Handles switching the tile data to the black status bar ; window anchored to the bottom of the screen during pinball ; gameplay. @@ -1121,7 +1121,7 @@ StatIntrTogglePokedexWindow: ; 0xfea ld [rSCY], a jp StatIntrDone -StatIntrToggleHighScoresWindow +StatIntrToggleHighScoresWindow: ld hl, hLastLYC ld a, [rLY] cp [hl] @@ -2037,7 +2037,7 @@ Func_1fb3: ld [hLoadedROMBank], a ld [MBC5RomBank], a ld hl, OAMDataPointers -asm_1fca +asm_1fca: add hl, de ld a, [hli] ld e, a @@ -2179,7 +2179,7 @@ MultiplyBbyCUnsigned: ; 0x20ab push af xor a ld [hSignedMathSignBuffer], a - jr asm_20c6 + jr MultiplyBbyCSigned.asm_20c6 MultiplyBbyCSigned: ; s16 bc = (s8)b * (s8)c @@ -2195,12 +2195,12 @@ MultiplyBbyCSigned: ld b, a .asm_20be bit 7, c - jr z, asm_20c6 + jr z, .asm_20c6 ld a, c cpl inc a ld c, a -asm_20c6 +.asm_20c6 ; b*c == (b**2 + c**2 - (b - c)**2) / 2 push de push hl diff --git a/home/serial.asm b/home/serial.asm index b63e2a3..676da86 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -136,7 +136,7 @@ Func_1527: ; 1527 (0:1527) .asm_15b5 ld a, [wd8c8 + 1] ld [wd8c8], a -asm_15bb +Func_15bb: ld a, $7 ld [wd8ad], a ld a, $1 @@ -181,7 +181,7 @@ Func_15f8: ; 15f8 (0:15f8) inc [hl] ld a, [hl] cp $2 - jr z, asm_15bb + jr z, Func_15bb ret Func_1612: ; 1612 (0:1612) -- cgit v1.2.3