Finish labelling and split off bank03, bank09, and bank0b (#119)
Some checks failed
CI / build (push) Has been cancelled

* Fully labelled bank09.asm, started bank03.asm

* Finished labelling bank03.asm and bank0b.asm

* Tying up loose ends, splitting most of the completely labelled bank dumps

* Moved pokedex letter graphics out of charmap
This commit is contained in:
DrippingYellow
2025-07-30 16:35:58 -05:00
committed by GitHub
parent 030186d4cf
commit e384ea25ec
107 changed files with 12604 additions and 10906 deletions

View File

@@ -137,17 +137,17 @@ SetDemoEventFlags:
set 2, [hl] ; beat rival in lab
ld hl, wd41b
set 2, [hl] ; chose a starter
ld a, %1
ld a, 1
ld [wd29a], a
ld a, %1
ld a, 1
ld [wd29b], a
ld a, %110
ld a, 6
ld [wd29c], a
ld a, %10010
ld a, 18
ld [wd29d], a
ld a, %110
ld a, 6
ld [wd29e], a
ld a, %10
ld a, 2
ld [wd2a0], a
ret

View File

@@ -5,7 +5,7 @@ FieldDebug_ChangeTileset:
call LoadMenuHeader
ld a, [wMapTileset]
inc a
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call VerticalMenu
call CloseWindow
jr c, .reopen

View File

@@ -3,7 +3,7 @@ FieldDebug_ChangeTransportation:
call LoadMenuHeader
ld a, [wPlayerState]
call GetActiveTransportation
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
dec a
call CopyNameFromMenu
call VerticalMenu

View File

@@ -10,7 +10,7 @@ ItemTest_BagMenu:
db 1
.MenuData:
db SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_FUNCTION3
db SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_ENABLE_FUNCTION3
db 4, 8 ; rows, columns
db SCROLLINGMENU_ITEMS_QUANTITY
dbw 0, wItems
@@ -34,7 +34,7 @@ ItemTest_KeyItemMenu:
db 1
.MenuData:
db SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_FUNCTION3
db SCROLLINGMENU_ENABLE_RIGHT | SCROLLINGMENU_ENABLE_LEFT | SCROLLINGMENU_ENABLE_FUNCTION3
db 4, 8 ; rows, columns
db SCROLLINGMENU_ITEMS_QUANTITY
dbw 0, wNumKeyItems
@@ -73,7 +73,7 @@ FieldDebug_ItemTest:
call .ClearTilemap
.bag_menu
ld hl, ItemTest_BagMenu
call Function3810
call ScrollingMenu_FromTable
ld a, [wMenuJoypad]
cp B_BUTTON
jr z, .exit_menu
@@ -85,7 +85,7 @@ FieldDebug_ItemTest:
.key_item_menu
ld hl, ItemTest_KeyItemMenu
call Function3810
call ScrollingMenu_FromTable
ld a, [wMenuJoypad]
cp B_BUTTON
jr z, .exit_menu
@@ -243,11 +243,11 @@ FieldDebug_ItemTest:
ld a, [wCurItem]
call ItemTest_FindUsableItem
jr c, .use_item2
call UseItem
call DoItemEffect
jp .restart
.use_item
call UseItem
call DoItemEffect
ld a, [wFieldMoveSucceeded]
and a
jp z, .restart
@@ -255,7 +255,7 @@ FieldDebug_ItemTest:
ret
.use_item2
call UseItem
call DoItemEffect
call ClearBGPalettes
call RestoreScreenAndReloadTiles
jp .restart

View File

@@ -178,7 +178,7 @@ DebugMapViewer_ShowViewerPrompt:
ld a, DEBUGMAPVIEWER_MOVE_CURSOR_TO_PLAYER
ldh [hDebugMapViewerJumptable], a
.no
call Function1fea
call ScreenCleanup
ret
.ChangeViewerPrompt:
@@ -194,7 +194,7 @@ DebugMapViewer_ShowSelectedDetails:
jr nc, .skip
call RefreshScreen
call .DisplayActorCastID
call Function1fea
call ScreenCleanup
ret
.skip
call DisplayBGEventDetails
@@ -370,7 +370,7 @@ DisplayBGEventDetails:
call .PrintTableDetails
call .WaitInput
call CloseWindow
call Function1fea
call ScreenCleanup
ret
.Functionfd0cc:

View File

@@ -46,7 +46,7 @@ FieldDebug_Minigames:
call ClearTileMap
call WaitBGMap
ld hl, wQueuedScriptBank
call CallFar_atHL
call CallPointerAt
call ClearPalettes
call ReloadSpritesAndFont
call LoadTilesetGFX

View File

@@ -36,7 +36,7 @@ FieldDebug_MoveToRoute1Entrance:
ld a, PLAYER_OBJECT
ld hl, wMovementBuffer
call LoadMovementDataPointer
call Function1fea
call ScreenCleanup
ret
.MoveText:

View File

@@ -8,7 +8,7 @@ FieldDebug_PokemartMenu:
.DoPokemartMenu:
call LoadStandardMenuHeader
callfar asm_24860
callfar PlaceMoneyTopRight
ld hl, DebugMart_PokemartMenuText
call PrintText
ld hl, .MenuHeader
@@ -118,11 +118,11 @@ DebugMart_Buy:
cp A_BUTTON
jr z, .buy_item
.buy_item
ld a, 99
ld a, MAX_ITEM_STACK
ld [wItemQuantityBuffer], a
ld hl, .HowManyText
call PrintText
callfar asm_24c64
callfar SelectQuantityToBuy
call ExitMenu
jr c, .done
predef LoadItemData
@@ -152,10 +152,10 @@ DebugMart_Buy:
.ConfirmPurchaseText:
text_from_ram wStringBuffer2
text "を @"
deciram wItemQuantity, 1, $2
deciram wItemQuantity, 1, 2
text "こで"
line "@"
deciram hFFCD, 3, $6
deciram hMoneyTemp, 3, 6
text "円 おかいあげですか?"
done
@@ -260,7 +260,7 @@ DebugMart_Sell:
.ItemQuantityPrompt:
ld hl, .HowManyItemsText
call PrintText
callfar asm_24c64
callfar SelectQuantityToBuy
jr c, .got_quantity
jr .CannotSellItem
@@ -300,11 +300,11 @@ DebugMart_LoadItems:
ld [wCurItem], a
callfar GetItemPrice
ld a, d
ld [wMiscStringBuffer], a
ld [wBuySellItemPrice], a
ld a, e
ld [wMiscStringBuffer + 1], a
ld [wBuySellItemPrice + 1], a
ld hl, wStringBuffer1
ld de, wMiscStringBuffer
ld de, wBuySellItemPrice
lb bc, PRINTNUM_LEADINGZEROS | 2, 6
call PrintNumber
pop hl

View File

@@ -169,7 +169,7 @@ FieldDebug_SpriteViewer:
.UpdateMenu:
call .SetMenuAttributes
.loop2
call Get2DMenuJoypad
call StaticMenuJoypad
ld a, [wMenuCursorY]
ld [wSpriteViewerSavedMenuPointerY], a
ldh a, [hJoySum]

View File

@@ -62,7 +62,7 @@ OpenToolgearMenu:
ld hl, .MenuHeader
call LoadMenuHeader
call .AfterToolgearOpen
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call VerticalMenu
call CloseWindow
ret

View File

@@ -35,7 +35,7 @@ FieldDebug_ShowWarpToText:
call CopyStringToStringBuffer2
ld hl, .WarpToText
call FieldDebug_ShowTextboxAndExit
call Function1fea
call ScreenCleanup
ret
.WarpToText:

View File

@@ -41,10 +41,10 @@ FieldDebugMenu::
call UpdateTimePals
call UpdateSprites
ld a, [wFieldDebugMenuCursorBuffer]
ld [wMenuCursorBuffer], a
ld [wMenuCursorPosition], a
call OpenMenu
jr c, .WaitInput
ld a, [wMenuCursorBuffer]
ld a, [wMenuCursorPosition]
ld [wFieldDebugMenuCursorBuffer], a
call PlaceHollowCursor
@@ -83,7 +83,7 @@ FieldDebugMenu::
.Cleanup:
push af
call Function1fea
call ScreenCleanup
pop af
ret