diff options
| author | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-01-30 21:40:19 -0600 |
| commit | 6cb885a9f68b9f445d7fa45279731336fe0247d4 (patch) | |
| tree | 39736ab1dd8ebcc57f8e981db6103285743d5530 /engine/debug | |
| parent | Identify unnamed functions in map_sprites.asm (#126) (diff) | |
| parent | Fix some label typos, and add some constants instead of raw numbers (#492) (diff) | |
| download | pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.gz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.tar.xz pokeyellow-6cb885a9f68b9f445d7fa45279731336fe0247d4.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/debug')
| -rw-r--r-- | engine/debug/debug_menu.asm | 6 | ||||
| -rw-r--r-- | engine/debug/debug_party.asm | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engine/debug/debug_menu.asm b/engine/debug/debug_menu.asm index b2efb940..92a6853f 100644 --- a/engine/debug/debug_menu.asm +++ b/engine/debug/debug_menu.asm @@ -782,9 +782,9 @@ Func_fec10: ldh [rBGP], a ldh [rOBP0], a ldh [rOBP1], a - call UpdateGBCPal_BGP - call UpdateGBCPal_OBP0 - call UpdateGBCPal_OBP1 + call UpdateCGBPal_BGP + call UpdateCGBPal_OBP0 + call UpdateCGBPal_OBP1 hlcoord 0, 0 lb bc, 1, 18 call TextBoxBorder diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 3c617938..407875e7 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -53,7 +53,7 @@ IF DEF(_DEBUG) ; Get some debug items. ld hl, wNumBagItems - ld de, DebugItemsList + ld de, DebugNewGameItemsList .items_loop ld a, [de] cp -1 @@ -76,12 +76,13 @@ IF DEF(_DEBUG) ; Rival chose Jolteon. ld hl, wRivalStarter + ASSERT wRivalStarter + 2 == wPlayerStarter ld a, RIVAL_STARTER_JOLTEON ld [hli], a ld a, NUM_POKEMON ld [hli], a ; hl = wUnknownDebugByte ld a, STARTER_PIKACHU - ld [hl], a ; hl = wPlayerStarter + ld [hl], a ; Give max money. ld hl, wPlayerMoney @@ -102,7 +103,7 @@ DebugSetPokedexEntries: ld [hl], %01111111 ret -DebugItemsList: +DebugNewGameItemsList: db MASTER_BALL, 99 db TOWN_MAP, 1 db BICYCLE, 1 @@ -119,7 +120,7 @@ DebugItemsList: db PP_UP, 99 db -1 ; end -DebugUnusedList: +DebugUnusedList: ; unreferenced db OLD_AMBER, 1 db DOME_FOSSIL, 1 db HELIX_FOSSIL, 1 |