diff options
| author | Rangi <remy.oukaour+rangi@gmail.com> | 2020-08-09 14:03:48 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi@gmail.com> | 2020-08-09 14:03:48 -0400 |
| commit | a75c6619fb933dc2d4c94b24394fb6fa9335b3b1 (patch) | |
| tree | 6e90a61bcfa23f20358009d29eb8c2c38bcebe6a | |
| parent | b7da8dbb0e2236f37e4b4c99b88598369da3a008 (diff) | |
Remove "; if DEBUG" comments for SECTIONs, and "if DEBUG" conditions since only the debug Gold ROM is built
38 files changed, 11 insertions, 191 deletions
@@ -24,7 +24,7 @@ RGBFIX ?= $(RGBDS)rgbfix RGBGFX ?= $(RGBDS)rgbgfx RGBLINK ?= $(RGBDS)rgblink -RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD -DDEBUG=1 +RGBASMFLAGS := -h -E -i $(BUILD)/ -DGOLD tools/gfx := @@ -135,7 +135,7 @@ $(BUILD)/%.tilemap: %.png | $$(dir $$@) mkdir -p $@ -### Scan .asm files for INCLUDE/INCBIN dependencies +### Scan .asm files for INCLUDE dependencies DEPENDENCY_SCAN_EXIT_STATUS := $(shell $(PYTHON) tools/scan_includes.py $(BUILD:%=-b %) $(ASMFILES) > dependencies.d; echo $$?) ifneq ($(DEPENDENCY_SCAN_EXIT_STATUS), 0) diff --git a/data/items/names.asm b/data/items/names.asm index 3ae826d..b8d6d75 100644 --- a/data/items/names.asm +++ b/data/items/names.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "data/items/names.asm", ROMX -; else -; SECTION "ItemNames", ROMX[$6FE9], BANK[$01] -; endc ItemNames:: db "マスターボール@" ; MASTER_BALL diff --git a/data/pokemon/base_stats/kirinriki.inc b/data/pokemon/base_stats/kirinriki.inc index 30b2312..400a807 100644 --- a/data/pokemon/base_stats/kirinriki.inc +++ b/data/pokemon/base_stats/kirinriki.inc @@ -6,11 +6,7 @@ db TYPE_DARK, TYPE_NORMAL ; type db 255 ; catch rate db 100 ; base exp -if DEBUG || def(SILVER) db ITEM_BERRY, ITEM_TAG ; items -else - db ITEM_APPLE, ITEM_TAG ; item -endc db GENDER_50_50 ; gender ratio db 100, 4, 70 ; unknown dn 7, 7 ; sprite dimensions diff --git a/data/tileset_headers.asm b/data/tileset_headers.asm index f739d1b..2c00ffe 100644 --- a/data/tileset_headers.asm +++ b/data/tileset_headers.asm @@ -1,10 +1,7 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "data/tileset_headers.asm", ROMX -; else -; SECTION "Tileset Headers", ROMX[$4875], BANK[$03] -; endc + Tilesets:: Tileset_00: ; 0xc88d diff --git a/engine/predef.asm b/engine/predef.asm index c9293b4..92fed51 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "engine/predef.asm", ROMX -; else -; SECTION "Predef pointers", ROMX[$62AD], BANK[$01] -; endc GetPredefPointer:: ; 1:62b0 ld a, h diff --git a/engine/title.asm b/engine/title.asm index c39abdd..5abeade 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -420,12 +420,8 @@ TitleSeq_TitleScreenInputAndTimeout:: jr .psbtn_nextseq .psbtn_gotodebug -if DEBUG ld a, $01 ; DebugMenu jr .psbtn_nextseq -else - ret -endc .psbtn_sramclear ld a, $02 @@ -629,12 +625,7 @@ SetTitleGfxNext:: jr nz, .loop ret -; if DEBUG SECTION "engine/title.asm@Title screen TEMPORARY", ROMX -; else -; SECTION "Title screen TEMPORARY", ROMX[$62A2], BANK[$01] ; TODO: merge this with the main section above -; endc - GameInit:: call ClearWindowData @@ -93,22 +93,14 @@ MailIconGFX:: INCBIN "gfx/icons/mail.2bpp" SECTION "gfx.asm@Trainer Card GFX", ROMX -TrainerCardBorderGFX:: INCBIN "gfx/trainer_card/border.2bpp" -TrainerCardGFX:: INCBIN "gfx/trainer_card/trainer_card.2bpp" ; 0x013171--0x013381 -TrainerCardColonGFX:: INCBIN "gfx/trainer_card/colon.2bpp" ; 0x013381--0x013391 -TrainerCardIDNoGFX:: INCBIN "gfx/trainer_card/id_no.2bpp" ; 0x013391--0x0133B1 +TrainerCardBorderGFX:: INCBIN "gfx/trainer_card/border.2bpp" +TrainerCardGFX:: INCBIN "gfx/trainer_card/trainer_card.2bpp" ; 0x013171--0x013381 +TrainerCardColonGFX:: INCBIN "gfx/trainer_card/colon.2bpp" ; 0x013381--0x013391 +TrainerCardIDNoGFX:: INCBIN "gfx/trainer_card/id_no.2bpp" ; 0x013391--0x0133B1 TrainerCardIDNoGFXEnd:: -TrainerCardLeadersGFX:: INCBIN "gfx/trainer_card/leaders.2bpp" ; 0x0133B1--0x133BA1 -if DEBUG || def(GOLD) +TrainerCardLeadersGFX:: INCBIN "gfx/trainer_card/leaders.2bpp" ; 0x0133B1--0x133BA1 db $18, $00 ; leftover of previous graphics -else - db $b2, $aa ; leftover of previous graphics? -endc - -if DEBUG -; Not sure how to parse this from the non-debug ROM, so I'll leave this be for now Unreferenced_UnusedLeaderNameGFX:: INCBIN "gfx/trainer_card/unused_leader_name.2bpp" ; 0x13ba3 -endc SECTION "gfx.asm@Bank 6 Tilesets 00", ROMX Tileset_00_GFX: diff --git a/home/audio.asm b/home/audio.asm index c157bed..f5154ae 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/audio.asm", ROM0 -; else -; SECTION "Audio interface", ROM0[$3C83] -; endc DisableAudio:: ; 3cbf push hl diff --git a/home/bankswitch.asm b/home/bankswitch.asm index a0e0d9d..1df28e1 100644 --- a/home/bankswitch.asm +++ b/home/bankswitch.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/bankswitch.asm", ROM0 -; else -; SECTION "Bankswitch", ROM0[$3286] -; endc ; Moved to a rst vector in final US releases (not sure about JP) ; All rst vectors are unused at this point in development diff --git a/home/clear_sprites.asm b/home/clear_sprites.asm index dca5479..c30c93d 100644 --- a/home/clear_sprites.asm +++ b/home/clear_sprites.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/clear_sprites.asm", ROM0 -; else -; SECTION "Sprite clearing", ROM0[$32A0] -; endc ClearSprites:: ; 32dc ld hl, wVirtualOAM diff --git a/home/copy.asm b/home/copy.asm index 6efabc4..0235906 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/copy.asm", ROM0 -; else -; SECTION "Copy functions", ROM0[$32BB] -; endc FarCopyBytes:: ; 32f7 ; Copy bc bytes from a:hl to de. diff --git a/home/fade.asm b/home/fade.asm index 4da54a0..882a200 100644 --- a/home/fade.asm +++ b/home/fade.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/fade.asm", ROM0 -; else -; SECTION "DMG Palette Fade Effect", ROM0 [$0307] -; endc Function0343:: ; 0343 ld a, [wTimeOfDayPal] diff --git a/home/farcall.asm b/home/farcall.asm index 7f4d759..8a5485b 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/farcall.asm", ROM0 -; else -; SECTION "FarCall", ROM0[$2F6C] -; endc FarCall_hl:: ; 2fa8 push af diff --git a/home/init.asm b/home/init.asm index 7407f63..0e690aa 100644 --- a/home/init.asm +++ b/home/init.asm @@ -7,19 +7,7 @@ SECTION "home/init.asm@Entry point", ROM0 SECTION "home/init.asm@Global check value", ROM0 ; The ROM has an incorrect global check, so set it here ; It is not corrected by RGBFIX -if def(GOLD) -if DEBUG - db $21, $C6 -else - db $7e, $49 -endc -else -if DEBUG - db $c9, $2f -else - db $b1, $7a -endc -endc + dw $C621 SECTION "home/init.asm@Init", ROM0 diff --git a/home/items.asm b/home/items.asm index f37a4df..5df4d13 100755 --- a/home/items.asm +++ b/home/items.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/items.asm@TossItem", ROM0 -; else -; SECTION "TossItem", ROM0[$3207] -; endc TossItem: ; 00:3243 ldh a, [hROMBank] @@ -45,11 +41,7 @@ ReceiveItem:: ; 3259 pop bc ret -; if DEBUG SECTION "home/items.asm@GiveItem", ROM0 -; else -; SECTION "GiveItem", ROM0[$3630] -; endc GiveItem:: ; Give player quantity c of item b, diff --git a/home/jumptable.asm b/home/jumptable.asm index 4f9294f..7aba401 100644 --- a/home/jumptable.asm +++ b/home/jumptable.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/jumptable.asm", ROM0 -; else -; SECTION "Jumptable functions", ROM0[$3591] -; endc CallJumptable:: ; 35cd (0:35cd) ; CallJumptable diff --git a/home/math.asm b/home/math.asm index dd7718d..31b7cd9 100644 --- a/home/math.asm +++ b/home/math.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/math.asm", ROM0 -; else -; SECTION "Math utility functions", ROM0 [$3344] -; endc Multiply:: push hl diff --git a/home/misc_32c8.asm b/home/misc_32c8.asm index ae12d23..3b1f898 100644 --- a/home/misc_32c8.asm +++ b/home/misc_32c8.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/misc_32c8.asm@Unknown 32c8", ROM0 -; else -; SECTION "Unknown 32c8", ROM0[$328c] -; endc Function32c8:: predef GetItemAmount @@ -27,11 +23,7 @@ SubtractSigned:: scf ret -; if DEBUG SECTION "home/misc_32c8.asm@Unknown 3686", ROM0 -; else -; SECTION "Unknown 3686", ROM0[$364a] -; endc GiveMonToPlayer:: ; 3686 ; Give to the player Pokemon of species b at level c. diff --git a/home/mon_stats.asm b/home/mon_stats.asm index e5b16db..7b07333 100644 --- a/home/mon_stats.asm +++ b/home/mon_stats.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/mon_stats.asm", ROM0 -; else -; SECTION "Mon Stats", ROM0 [$390f] -; endc DrawBattleHPBar:: push hl diff --git a/home/names.asm b/home/names.asm index 7b5b995..96100cd 100644 --- a/home/names.asm +++ b/home/names.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/names.asm@Names", ROM0 -; else -; SECTION "Names", ROM0[$368c] ; Unsure -; endc NamesPointers:: ; 00:36c8 ; entries correspond to GetName constants (see constants/text_constants.asm) diff --git a/home/overworld.asm b/home/overworld.asm index f276ea1..412d3b9 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1,16 +1,11 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/overworld.asm@Startmenu and Select Button Check", ROM0 -; else -; SECTION "Startmenu and Select Button Check", ROM0[$2BDF] -; endc OverworldStartButtonCheck:: ; 2c05 (0:2c05) ldh a, [hJoyState] bit START_F, a ret z -if DEBUG and (START | B_BUTTON) cp (START | B_BUTTON) jr nz, .regularMenu @@ -20,7 +15,6 @@ if DEBUG callba InGameDebugMenu jr CheckStartmenuSelectHook .regularMenu -endc callba DisplayStartMenu jr CheckStartmenuSelectHook SelectButtonFunction:: ; 2c2a (0:2c2a) @@ -177,11 +171,7 @@ ScheduleColumnRedrawHelper: ; 2d10 (0:2d10) jr nz, .loop ret -; if DEBUG SECTION "home/overworld.asm@QueueScript", ROM0 -; else -; SECTION "QueueScript", ROM0[$35B0] -; endc QueueScript:: ; Install a function that is called as soon as diff --git a/home/pokemon.asm b/home/pokemon.asm index a98122c..7a72646 100644 --- a/home/pokemon.asm +++ b/home/pokemon.asm @@ -1,10 +1,7 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/pokemon.asm@3A4B", ROM0 -; else -; SECTION "3A4B", ROM0[$3A0F] -; endc + GetMonHeader:: ; 3a4b (0:3a4b) ; copies the base stat data of a pokemon to wMonHeader ; INPUT: @@ -47,11 +44,7 @@ GetMonHeader:: ; 3a4b (0:3a4b) pop bc ret -; if DEBUG SECTION "home/pokemon.asm@3AED", ROM0 -; else -; SECTION "3AED", ROM0[$3AB1] -; endc UncompressMonSprite:: ; 3aed (0:3aed) ; Uncompresses the front or back sprite of the specified mon diff --git a/home/predef.asm b/home/predef.asm index c9457a8..e4fbfdd 100644 --- a/home/predef.asm +++ b/home/predef.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/predef.asm", ROM0 -; else -; SECTION "Predef", ROM0[$2FA2] -; endc Predef:: ; 2fde ld [wPredefID], a diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 8b96d4b..ff4d8cb 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/print_bcd.asm", ROM0 -; else -; SECTION "BCD Functions", ROM0[$3A76] -; endc ; function to print a BCD (Binary-coded decimal) number ; de = address of BCD number diff --git a/home/print_hex.asm b/home/print_hex.asm index 2a68c2b..1108afa 100644 --- a/home/print_hex.asm +++ b/home/print_hex.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/print_hex.asm", ROM0 -; else -; SECTION "Print Hexadecimal functions", ROM0[$355B] -; endc PrintHexBytes: ; 3597 (0:3597) ; Print c hex bytes located at de to hl diff --git a/home/print_num.asm b/home/print_num.asm index 2a0f36f..3a2a2fb 100644 --- a/home/print_num.asm +++ b/home/print_num.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/print_num.asm", ROM0 -; else -; SECTION "Number Printing Functions", ROM0[$3424] -; endc PrintNumber:: ; 3460 (0:3460) ; function to print a number diff --git a/home/print_text.asm b/home/print_text.asm index 61cc9e1..f45a045 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/print_text.asm", ROM0 -; else -; SECTION "Print Letter Delay", ROM0[$3367] -; endc PrintLetterDelay:: ; 33a3 (0:33a3) ld a, [wce5f] diff --git a/home/random.asm b/home/random.asm index 7c833b5..690c4b9 100644 --- a/home/random.asm +++ b/home/random.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/random.asm", ROM0 -; else -; SECTION "Random Number Generation", ROM0 [$3234] -; endc Random:: ; A simple hardware-based random number generator (RNG). diff --git a/home/rst.asm b/home/rst.asm index 7d087aa..6fea377 100644 --- a/home/rst.asm +++ b/home/rst.asm @@ -22,8 +22,4 @@ SECTION "home/rst.asm@rst30", ROM0 rst $38 SECTION "home/rst.asm@rst38", ROM0 -if DEBUG && def(SILVER) - rst $38 -else jp $F080 ; Jumps in the middle of unmapped memory. Probably used to trigger a breakpoint of sorts. -endc diff --git a/home/rtc.asm b/home/rtc.asm index 651a7b6..dd38876 100644 --- a/home/rtc.asm +++ b/home/rtc.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/rtc.asm", ROM0 -; else -; SECTION "Time Of Day Palettes", ROM0 [$02EF] -; endc UpdateTimeOfDayPalettes: ; 32b (0:032b) ld a, [wVramState] diff --git a/home/scrolling_menu.asm b/home/scrolling_menu.asm index 0c86363..ed2fd6b 100644 --- a/home/scrolling_menu.asm +++ b/home/scrolling_menu.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/scrolling_menu.asm", ROM0 -; else -; SECTION "Scrolling Menu", ROM0 [$37D4] -; endc Function3810:: ld e, [hl] diff --git a/home/sram.asm b/home/sram.asm index da27c81..5089254 100644 --- a/home/sram.asm +++ b/home/sram.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/sram.asm", ROM0 -; else -; SECTION "SRAM functions", ROM0[$326B] -; endc OpenSRAM:: ; 32a7 push af diff --git a/home/talk_to_npc.asm b/home/talk_to_npc.asm index ddc2fcd..3206fe5 100644 --- a/home/talk_to_npc.asm +++ b/home/talk_to_npc.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/talk_to_npc.asm", ROM0 -; else -; SECTION "Unknown 3025", ROM0 [$2fe9] -; endc MapDefaultText:: ld hl, GameplayText diff --git a/home/tilemap.asm b/home/tilemap.asm index 6348671..e814e5b 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -1,10 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/tilemap.asm", ROM0 -; else -; SECTION "Tilemap Functions", ROM0 [$35CF] -; endc Function360b:: call ClearSprites diff --git a/home/toolgear.asm b/home/toolgear.asm index 59baf51..c5343da 100644 --- a/home/toolgear.asm +++ b/home/toolgear.asm @@ -109,7 +109,6 @@ UpdateToolgear:: ; 2075 ld a, " " call ByteFill -if DEBUG ld hl, wd153 bit 0, [hl] jr z, .debug_show_time @@ -122,8 +121,7 @@ if DEBUG ld c, $01 call .printHex ret -.debug_show_time: -endc +.debug_show_time ld hl, hRTCHours bgcoord de, 0, 1, wToolgearBuffer diff --git a/home/unknown.asm b/home/unknown.asm index 6e540f8..0fe5d28 100644 --- a/home/unknown.asm +++ b/home/unknown.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/unknown.asm@Empty function", ROM0 -; else -; SECTION "Empty function", ROM0[$2F5B] -; endc InexplicablyEmptyFunction:: ; 2f97 rept 16 diff --git a/home/unknown_388f.asm b/home/unknown_388f.asm index 85aa781..631e0c2 100644 --- a/home/unknown_388f.asm +++ b/home/unknown_388f.asm @@ -1,11 +1,6 @@ include "constants.asm" -; if DEBUG SECTION "home/unknown_388f.asm", ROM0 -; else -; SECTION "Unknown 388F", ROM0 [$3853] -; endc - Function388f:: ret diff --git a/home/util.asm b/home/util.asm index f7ddc1f..ed3f16b 100644 --- a/home/util.asm +++ b/home/util.asm @@ -1,10 +1,6 @@ INCLUDE "constants.asm" -; if DEBUG SECTION "home/util.asm", ROM0 -; else -; SECTION "Misc Utility Functions", ROM0[$33B3] -; endc Function33ef:: ; hl = src |