sync some decomp changes

This commit is contained in:
Cameron Ross 2024-07-17 18:34:22 -03:00
parent 7bb0b86ae1
commit a83f43578f
No known key found for this signature in database
GPG Key ID: 777897D98DC91C54
42 changed files with 236 additions and 154 deletions

View File

@ -12571,7 +12571,7 @@ dumpEntries:
extension: gfx
compressed: false
- subdir: ''
name: kirby
name: debug_cursor
offset: 0x2FCFA8
size: 288
extension: gfx

View File

@ -12571,7 +12571,7 @@ dumpEntries:
extension: gfx
compressed: false
- subdir: ''
name: kirby
name: debug_cursor
offset: 0x2FEFB7
size: 288
extension: gfx

View File

@ -584,8 +584,8 @@
EVENT_CALLROUTINE DECOMP_NINTENDO_PRESENTATION
.ENDMACRO
.MACRO EVENT_LOAD_KIRBY_SPRITE
EVENT_CALLROUTINE LOAD_KIRBY_SPRITE
.MACRO EVENT_LOAD_DEBUG_CURSOR_GRAPHICS
EVENT_CALLROUTINE LOAD_DEBUG_CURSOR_GRAPHICS
.ENDMACRO
.MACRO EVENT_SRAM_CHECK_ROUTINE_CHECKSUM

View File

@ -1182,17 +1182,17 @@
.GLOBAL UNKNOWN_C3F871: far
.GLOBAL UNKNOWN_C3F8B1: far
.GLOBAL UNKNOWN_C3F8F1: far
.GLOBAL UNKNOWN_C3F951: far
.GLOBAL ENEMY_PSI_COLOURS: far
.GLOBAL MISC_SWIRL_COLOURS: far
.GLOBAL UNKNOWN_C3FAC9: far
.GLOBAL UNKNOWN_C3FB09: far
.GLOBAL UNKNOWN_C3FB1F: far
.GLOBAL HP_METER_SPEEDS: far
.GLOBAL NAME_REGISTRY_REQUEST_STRING: far
.GLOBAL UNKNOWN_C3FB45: far
.GLOBAL UNKNOWN_C3FC49: far
.GLOBAL UNKNOWN_C3FD2D: far
.GLOBAL CONSONANT_VOWEL_TRANSLITERATION_PAIRS: far
.GLOBAL NAMING_SCREEN_ENTITIES: far
.GLOBAL FILE_SELECT_SUMMARY_PARTY_SPRITE_CONFIG: far
.GLOBAL ATTRACT_MODE_TXT: far
.GLOBAL UNKNOWN_C3FDB5: far
.GLOBAL UNUSED_FORSALE_SIGN_SPRITE_TABLE: far
.GLOBAL PARTY_MEMBER_CAST_TILE_IDS: far
.GLOBAL FOR_SALE_SIGN_SPRITE_TABLE: far
.GLOBAL FINAL_BATTLE_ANTIPIRACY_CHECK: far
.GLOBAL ANTIPIRACY_CHECKSUM_2: far

View File

@ -16,9 +16,6 @@
.GLOBAL SAVE_GAME_SLOT: far
.GLOBAL LOAD_GAME_SLOT: far
.GLOBAL CHECK_SRAM_INTEGRITY: far
.GLOBAL CHECK_SRAM_INTEGRITY_GOOD_SRAM: far
.GLOBAL CHECK_SRAM_INTEGRITY_LOOP_BEGINNING: far
.GLOBAL CHECK_SRAM_INTEGRITY_LOOP_ENTRY: far
.GLOBAL ERASE_SAVE: far
.GLOBAL COPY_SAVE: far
.GLOBAL UNKNOWN_EF0C3D: far
@ -85,7 +82,7 @@
.GLOBAL UNKNOWN_EFD9F3: far
.GLOBAL UNKNOWN_EFDFC4: far
.GLOBAL UNKNOWN_EFE07C: far
.GLOBAL LOAD_KIRBY_SPRITE: far
.GLOBAL LOAD_DEBUG_CURSOR_GRAPHICS: far
.GLOBAL DEBUG_MENU_LOAD: far
.GLOBAL UNKNOWN_EFE6CF: far
.GLOBAL UNKNOWN_EFE6E2: far
@ -106,12 +103,9 @@
.GLOBAL UNKNOWN_EFEB3D: far
.GLOBAL DEBUG_MENU_FONT: far
.GLOBAL UNKNOWN_EFEF70: far
.GLOBAL UNKNOWN_EFEF9F: far
.GLOBAL KIRBY: far
.GLOBAL DEBUG_FONT_PALETTE: far
.GLOBAL DEBUG_CURSOR_GRAPHICS: far
.GLOBAL UNKNOWN_EFF0D7: far
.GLOBAL UNKNOWN_EFF1BB: far
.GLOBAL UNKNOWN_VERSION_STRING: far
.GLOBAL UNKNOWN_EFF3DB: far
.GLOBAL UNKNOWN_EFF511: far
.GLOBAL UNKNOWN_EFF53B: far
.GLOBAL UNKNOWN_EFF5BB: far
.GLOBAL DEBUG_CURSOR_SPRITEMAP: far

View File

@ -12553,7 +12553,7 @@ dumpEntries:
extension: gfx
compressed: false
- subdir: ''
name: kirby
name: debug_cursor
offset: 0x2FD8E2
size: 288
extension: gfx

View File

@ -2120,7 +2120,9 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "data/unknown/C3F8F1.asm"
.INCLUDE "data/unknown/C3F951.asm"
.INCLUDE "data/enemy_psi_colours.asm"
.INCLUDE "data/misc_swirl_colours.asm"
.INCLUDE "unknown/C3/C3F981.asm"
@ -2128,21 +2130,19 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "unknown/C3/C3FB09.asm"
.INCLUDE "data/unknown/C3FB1F.asm"
.INCLUDE "data/hp_meter_speeds.asm"
.INCLUDE "data/text/name_registry_request_string.asm"
.INCLUDE "data/unknown/C3FB45.asm"
.INCLUDE "data/text/consonant_vowel_transliteration_pairs.asm"
.INCLUDE "data/unknown/C3FC49.asm"
.INCLUDE "data/unknown/C3FD2D.asm"
.INCLUDE "data/naming_screen_entities.asm"
.INCLUDE "data/file_select_summary_party_sprite_config.asm"
.INCLUDE "data/attract_mode_text_pointers.asm"
.INCLUDE "data/unused_for_sale_sign_sprite_table.asm"
.INCLUDE "data/for_sale_sign_sprite_table.asm"
.INCLUDE "system/antipiracy/final_battle_antipiracy_check.asm"

View File

@ -239,7 +239,7 @@ AUDIO_PACK_7:
.INCLUDE "unknown/EF/EFE175-jp.asm"
.INCLUDE "system/debug/load_kirby_sprite.asm"
.INCLUDE "system/debug/load_debug_cursor_graphics.asm"
.INCLUDE "system/debug/handle_cursor_movement.asm"
@ -286,10 +286,10 @@ DEBUG_MENU_FONT:
.INCLUDE "data/unknown/EFEF70.asm"
.INCLUDE "data/unknown/EFEF9F.asm"
.INCLUDE "data/debug/debug_font_palette.asm"
KIRBY:
BINARY "kirby.gfx"
DEBUG_CURSOR_GRAPHICS:
BINARY "debug_cursor.gfx"
.INCLUDE "data/unknown/EFF0D7.asm"
@ -297,10 +297,10 @@ KIRBY:
.INCLUDE "data/unknown_version_string.asm"
.INCLUDE "data/unknown/EFF3DB.asm"
.INCLUDE "data/unused/EFF3DB.asm"
.INCLUDE "data/unknown/EFF511.asm"
.INCLUDE "data/unused/EFF511.asm"
.INCLUDE "data/unknown/EFF53B.asm"
.INCLUDE "data/unused/EFF53B.asm"
.INCLUDE "data/unknown/EFF5BB.asm"
.INCLUDE "data/debug/debug_cursor_spritemap.asm"

View File

@ -2140,7 +2140,9 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "data/unknown/C3F8F1.asm"
.INCLUDE "data/unknown/C3F951.asm"
.INCLUDE "data/enemy_psi_colours.asm"
.INCLUDE "data/misc_swirl_colours.asm"
.INCLUDE "unknown/C3/C3F981.asm"
@ -2148,23 +2150,21 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "unknown/C3/C3FB09.asm"
.INCLUDE "data/unknown/C3FB1F.asm"
.INCLUDE "data/hp_meter_speeds.asm"
.INCLUDE "data/text/name_registry_request_string.asm"
.INCLUDE "data/unknown/C3FB45.asm"
.INCLUDE "data/text/consonant_vowel_transliteration_pairs.asm"
.INCLUDE "data/unknown/C3FC49.asm"
.INCLUDE "data/unknown/C3FD2D.asm"
.INCLUDE "data/naming_screen_entities.asm"
.INCLUDE "data/file_select_summary_party_sprite_config.asm"
.INCLUDE "data/attract_mode_text_pointers.asm"
.INCLUDE "data/unknown/C3FDB5.asm"
.INCLUDE "data/text/party_member_cast_tile_ids.asm"
.INCLUDE "data/unused_for_sale_sign_sprite_table.asm"
.INCLUDE "data/for_sale_sign_sprite_table.asm"
.INCLUDE "system/antipiracy/final_battle_antipiracy_check.asm"

View File

@ -253,7 +253,7 @@
.INCLUDE "unknown/EF/EFE175.asm"
.INCLUDE "system/debug/load_kirby_sprite.asm"
.INCLUDE "system/debug/load_debug_cursor_graphics.asm"
.INCLUDE "system/debug/handle_cursor_movement.asm"
@ -300,10 +300,10 @@ DEBUG_MENU_FONT:
.INCLUDE "data/unknown/EFEF70.asm"
.INCLUDE "data/unknown/EFEF9F.asm"
.INCLUDE "data/debug/debug_font_palette.asm"
KIRBY:
BINARY "kirby.gfx"
DEBUG_CURSOR_GRAPHICS:
BINARY "debug_cursor.gfx"
.INCLUDE "data/unknown/EFF0D7.asm"
@ -311,10 +311,10 @@ KIRBY:
.INCLUDE "data/unknown_version_string.asm"
.INCLUDE "data/unknown/EFF3DB.asm"
.INCLUDE "data/unused/EFF3DB.asm"
.INCLUDE "data/unknown/EFF511.asm"
.INCLUDE "data/unused/EFF511.asm"
.INCLUDE "data/unknown/EFF53B.asm"
.INCLUDE "data/unused/EFF53B.asm"
.INCLUDE "data/unknown/EFF5BB.asm"
.INCLUDE "data/debug/debug_cursor_spritemap.asm"

View File

@ -2146,7 +2146,9 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "data/unknown/C3F8F1.asm"
.INCLUDE "data/unknown/C3F951.asm"
.INCLUDE "data/enemy_psi_colours.asm"
.INCLUDE "data/misc_swirl_colours.asm"
.INCLUDE "unknown/C3/C3F981.asm"
@ -2154,22 +2156,20 @@ SPRITE_GROUP_PALETTES:
.INCLUDE "unknown/C3/C3FB09.asm"
.INCLUDE "data/unknown/C3FB1F.asm"
.INCLUDE "data/hp_meter_speeds.asm"
.INCLUDE "data/text/name_registry_request_string.asm"
.INCLUDE "data/unknown/C3FB45.asm"
.INCLUDE "data/text/consonant_vowel_transliteration_pairs.asm"
.INCLUDE "data/unknown/C3FC49.asm"
.INCLUDE "data/unknown/C3FD2D.asm"
.INCLUDE "data/naming_screen_entities.asm"
.INCLUDE "data/file_select_summary_party_sprite_config.asm"
.INCLUDE "data/attract_mode_text_pointers.asm"
.INCLUDE "data/unknown/C3FDB5.asm"
.INCLUDE "data/text/party_member_cast_tile_ids.asm"
.INCLUDE "data/unused_for_sale_sign_sprite_table.asm"
.INCLUDE "data/for_sale_sign_sprite_table.asm"
.INCLUDE "system/antipiracy/final_battle_antipiracy_check-proto.asm"

View File

@ -157,7 +157,7 @@
.INCLUDE "unknown/EF/EFE175.asm"
.INCLUDE "system/debug/load_kirby_sprite.asm"
.INCLUDE "system/debug/load_debug_cursor_graphics.asm"
.INCLUDE "system/debug/handle_cursor_movement.asm"
@ -200,14 +200,14 @@
.INCLUDE "data/unknown/EFEB3D.asm"
DEBUG_MENU_FONT:
BINARY "fonts/debug.gfx"
LOCALEBINARY "fonts/debug.gfx"
.INCLUDE "data/unknown/EFEF70.asm"
.INCLUDE "data/unknown/EFEF9F.asm"
.INCLUDE "data/debug/debug_font_palette.asm"
KIRBY:
BINARY "kirby.gfx"
DEBUG_CURSOR_GRAPHICS:
LOCALEBINARY "debug_cursor.gfx"
.INCLUDE "data/unknown/EFF0D7.asm"
@ -215,10 +215,10 @@ KIRBY:
.INCLUDE "data/unknown_version_string.asm"
.INCLUDE "data/unknown/EFF3DB.asm"
.INCLUDE "data/unused/EFF3DB.asm"
.INCLUDE "data/unknown/EFF511.asm"
.INCLUDE "data/unused/EFF511.asm"
.INCLUDE "data/unknown/EFF53B.asm"
.INCLUDE "data/unused/EFF53B.asm"
.INCLUDE "data/unknown/EFF5BB.asm"
.INCLUDE "data/debug/debug_cursor_spritemap.asm"

View File

@ -0,0 +1,14 @@
DEBUG_CURSOR_SPRITEMAP:
.WORD .LOWORD(@UNKNOWN0)
@UNKNOWN0:
.BYTE $F4, $00, $30, $F4, $00
.BYTE $F4, $01, $30, $FC, $00
.BYTE $F4, $02, $30, $04, $00
.BYTE $FC, $03, $30, $F4, $00
.BYTE $FC, $04, $30, $FC, $00
.BYTE $FC, $05, $30, $04, $00
.BYTE $04, $06, $30, $F4, $00
.BYTE $04, $07, $30, $FC, $00
.BYTE $04, $08, $30, $04, $80
.BYTE $00

View File

@ -0,0 +1,17 @@
DEBUG_FONT_PALETTE:
RGB 0, 0, 0
RGB 0, 31, 31
RGB 31, 31, 6
RGB 31, 6, 6
RGB 0, 0, 0
RGB 26, 0, 26
RGB 11, 11, 31
RGB 6, 31, 6
RGB 0, 0, 0
RGB 0, 0, 26
RGB 31, 16, 0
RGB 31, 21, 21

View File

@ -1,5 +1,5 @@
UNKNOWN_C3F951:
ENEMY_PSI_COLOURS:
.BYTE 31,0,0
.BYTE 18,6,0
.BYTE 16,6,0
@ -11,8 +11,3 @@ UNKNOWN_C3F951:
.BYTE 18,18,18
.BYTE 18,18,31
.BYTE 31,31,11
.BYTE 15,15,15
.BYTE 15,15,0
.BYTE 15,7,15
.BYTE 0,0,15
.BYTE 31,0,12

View File

@ -1,10 +1,10 @@
EVENT_0:
EVENT_SET_ANIMATION_POINTER UNKNOWN_EFF5BB
EVENT_SET_ANIMATION_POINTER DEBUG_CURSOR_SPRITEMAP
EVENT_SET_POSITION_CHANGE_CALLBACK .LOWORD(UNKNOWN_C0A0BB)
EVENT_SET_DRAW_CALLBACK .LOWORD(UNKNOWN_C0A0FA)
EVENT_SET_ANIMATION $00
@UNKNOWN1:
EVENT_PAUSE $05
EVENT_LOAD_KIRBY_SPRITE
EVENT_LOAD_DEBUG_CURSOR_GRAPHICS
EVENT_SHORTJUMP .LOWORD(@UNKNOWN1)

View File

@ -1,5 +1,5 @@
UNUSED_FORSALE_SIGN_SPRITE_TABLE:
FOR_SALE_SIGN_SPRITE_TABLE:
.WORD OVERWORLD_SPRITE::GUY_IN_BLUE_CLOTHES
.WORD OVERWORLD_SPRITE::JAMAICAN_GUY
.WORD OVERWORLD_SPRITE::MR_T

View File

@ -0,0 +1,5 @@
HP_METER_SPEEDS:
.WORD $2000, 1 ;1 + 4/32
.WORD $1800, 1 ;1 + 3/32
.WORD $1000, 1 ;1 + 2/32

View File

@ -0,0 +1,7 @@
MISC_SWIRL_COLOURS:
.BYTE 15,15,15
.BYTE 15,15,0
.BYTE 15,7,15
.BYTE 0,0,15
.BYTE 31,0,12

View File

@ -0,0 +1,109 @@
NAMING_SCREEN_ENTITY_NESS_1:
.WORD OVERWORLD_SPRITE::NESS, EVENT_SCRIPT::EVENT_502
.WORD OVERWORLD_SPRITE::NESS_POSING, EVENT_SCRIPT::EVENT_503
.WORD OVERWORLD_SPRITE::NESS_SURPRISED, EVENT_SCRIPT::EVENT_504
.WORD OVERWORLD_SPRITE::SMALL_SHADOW, EVENT_SCRIPT::EVENT_505
.WORD OVERWORLD_SPRITE::SURPRISE_MARK, EVENT_SCRIPT::EVENT_506
.WORD 0
NAMING_SCREEN_ENTITY_NESS_2:
.WORD OVERWORLD_SPRITE::NESS, EVENT_SCRIPT::EVENT_532
.WORD OVERWORLD_SPRITE::NESS_POSING, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::NESS_SURPRISED, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::SMALL_SHADOW, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::SURPRISE_MARK, EVENT_SCRIPT::EVENT_035
.WORD 0
NAMING_SCREEN_ENTITY_PAULA_1:
.WORD OVERWORLD_SPRITE::PAULA, EVENT_SCRIPT::EVENT_507
.WORD OVERWORLD_SPRITE::PAULA_SURPRISED, EVENT_SCRIPT::EVENT_508
.WORD OVERWORLD_SPRITE::SMALL_SHADOW, EVENT_SCRIPT::EVENT_509
.WORD OVERWORLD_SPRITE::MUSIC_NOTES, EVENT_SCRIPT::EVENT_510
.WORD 0
NAMING_SCREEN_ENTITY_PAULA_2:
.WORD OVERWORLD_SPRITE::PAULA, EVENT_SCRIPT::EVENT_532
.WORD OVERWORLD_SPRITE::PAULA_SURPRISED, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::SMALL_SHADOW, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::MUSIC_NOTES, EVENT_SCRIPT::EVENT_035
.WORD 0
NAMING_SCREEN_ENTITY_JEFF_1:
.WORD OVERWORLD_SPRITE::JEFF, EVENT_SCRIPT::EVENT_511
.WORD OVERWORLD_SPRITE::SURPRISE_MARK, EVENT_SCRIPT::EVENT_512
.WORD OVERWORLD_SPRITE::SWEAT, EVENT_SCRIPT::EVENT_513
.WORD OVERWORLD_SPRITE::LIGHT_BULB, EVENT_SCRIPT::EVENT_514
.WORD 0
NAMING_SCREEN_ENTITY_JEFF_2:
.WORD OVERWORLD_SPRITE::JEFF, EVENT_SCRIPT::EVENT_532
.WORD OVERWORLD_SPRITE::SURPRISE_MARK, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::SWEAT, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::LIGHT_BULB, EVENT_SCRIPT::EVENT_035
.WORD 0
NAMING_SCREEN_ENTITY_POO_1:
.WORD OVERWORLD_SPRITE::POO, EVENT_SCRIPT::EVENT_515
.WORD OVERWORLD_SPRITE::POO_MEDITATING, EVENT_SCRIPT::EVENT_516
.WORD OVERWORLD_SPRITE::POO_CLIMBING_UP, EVENT_SCRIPT::EVENT_517
.WORD OVERWORLD_SPRITE::STAR_MASTERS_POOF_CLOUD, EVENT_SCRIPT::EVENT_518
.WORD 0
NAMING_SCREEN_ENTITY_POO_2:
.WORD OVERWORLD_SPRITE::POO, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::POO_MEDITATING, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::POO_CLIMBING_UP, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::STAR_MASTERS_POOF_CLOUD, EVENT_SCRIPT::EVENT_519
.WORD 0
NAMING_SCREEN_ENTITY_KING_1:
.WORD OVERWORLD_SPRITE::KING, EVENT_SCRIPT::EVENT_521
.WORD OVERWORLD_SPRITE::NESS_DOG_SLEEPING, EVENT_SCRIPT::EVENT_522
.WORD OVERWORLD_SPRITE::NESS, EVENT_SCRIPT::EVENT_520
.WORD OVERWORLD_SPRITE::ZZZ, EVENT_SCRIPT::EVENT_523
.WORD 0
NAMING_SCREEN_ENTITY_KING_2:
.WORD OVERWORLD_SPRITE::KING, EVENT_SCRIPT::EVENT_533
.WORD OVERWORLD_SPRITE::NESS_DOG_SLEEPING, EVENT_SCRIPT::EVENT_035
.WORD OVERWORLD_SPRITE::NESS, EVENT_SCRIPT::EVENT_532
.WORD OVERWORLD_SPRITE::ZZZ, EVENT_SCRIPT::EVENT_035
.WORD 0
NAMING_SCREEN_ENTITY_FAVOURITE_FOOD_1:
.WORD OVERWORLD_SPRITE::FRENCH_KISS_OF_DEATH, EVENT_SCRIPT::EVENT_524
.WORD OVERWORLD_SPRITE::A_PLATE, EVENT_SCRIPT::EVENT_526
.WORD 0
NAMING_SCREEN_ENTITY_FAVOURITE_FOOD_2:
.WORD OVERWORLD_SPRITE::FRENCH_KISS_OF_DEATH, EVENT_SCRIPT::EVENT_525
.WORD OVERWORLD_SPRITE::A_PLATE, EVENT_SCRIPT::EVENT_527
.WORD 0
NAMING_SCREEN_ENTITY_FAVOURITE_THING_1:
.WORD OVERWORLD_SPRITE::FRENCH_KISS_OF_DEATH, EVENT_SCRIPT::EVENT_528
.WORD OVERWORLD_SPRITE::TWINKLING_STARS, EVENT_SCRIPT::EVENT_530
.WORD 0
NAMING_SCREEN_ENTITY_FAVOURITE_THING_2:
.WORD OVERWORLD_SPRITE::FRENCH_KISS_OF_DEATH, EVENT_SCRIPT::EVENT_529
.WORD OVERWORLD_SPRITE::TWINKLING_STARS, EVENT_SCRIPT::EVENT_035
.WORD 0
NAMING_SCREEN_ENTITIES:
.DWORD NAMING_SCREEN_ENTITY_NESS_1
.DWORD NAMING_SCREEN_ENTITY_PAULA_1
.DWORD NAMING_SCREEN_ENTITY_JEFF_1
.DWORD NAMING_SCREEN_ENTITY_POO_1
.DWORD NAMING_SCREEN_ENTITY_KING_1
.DWORD NAMING_SCREEN_ENTITY_FAVOURITE_FOOD_1
.DWORD NAMING_SCREEN_ENTITY_FAVOURITE_THING_1
.DWORD NAMING_SCREEN_ENTITY_NESS_2
.DWORD NAMING_SCREEN_ENTITY_PAULA_2
.DWORD NAMING_SCREEN_ENTITY_JEFF_2
.DWORD NAMING_SCREEN_ENTITY_POO_2
.DWORD NAMING_SCREEN_ENTITY_KING_2
.DWORD NAMING_SCREEN_ENTITY_FAVOURITE_FOOD_2
.DWORD NAMING_SCREEN_ENTITY_FAVOURITE_THING_2

View File

@ -1,5 +1,5 @@
UNKNOWN_C3FB45:
CONSONANT_VOWEL_TRANSLITERATION_PAIRS:
.BYTE $00, $00, $00, $00, $00, $00, $00, $00, $00, $00
.BYTE $AA, $00, $6A, $00, $7A, $00, $8A, $00, $9A, $00
.BYTE $62, $00, $74, $00, $82, $00, $94, $00, $A2, $00

View File

@ -1,7 +1,7 @@
; Used as Y param for RENDER_CAST_NAME_TEXT and A param for PREPARE_CAST_NAME_TILEMAP
; A buffer offset of some sort?
UNKNOWN_C3FDB5:
PARTY_MEMBER_CAST_TILE_IDS:
.WORD $0180
.WORD $0190
.WORD $01A0

View File

@ -1,5 +0,0 @@
UNKNOWN_C3FB1F:
.WORD 8192,1
.WORD 6144,1
.WORD 4096,1

View File

@ -1,30 +0,0 @@
UNKNOWN_C3FC49:
UNKNOWN_C3FC49_ENTRY_0:
.BYTE $01, $00, $F6, $01, $0E, $00, $F7, $01, $4F, $01, $F8, $01, $58, $01, $F9, $01, $DA, $00, $FA, $01, $00, $00
UNKNOWN_C3FC49_ENTRY_1:
.BYTE $01, $00, $14, $02, $0E, $00, $23, $00, $4F, $01, $23, $00, $58, $01, $23, $00, $DA, $00, $23, $00, $00, $00
UNKNOWN_C3FC49_ENTRY_2:
.BYTE $02, $00, $FB, $01, $50, $01, $FC, $01, $58, $01, $FD, $01, $BE, $00, $FE, $01, $00, $00
UNKNOWN_C3FC49_ENTRY_3:
.BYTE $02, $00, $14, $02, $50, $01, $23, $00, $58, $01, $23, $00, $BE, $00, $23, $00, $00, $00
UNKNOWN_C3FC49_ENTRY_4:
.BYTE $03, $00, $FF, $01, $DA, $00, $00, $02, $DB, $00, $01, $02, $C2, $00, $02, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_5:
.BYTE $03, $00, $14, $02, $DA, $00, $23, $00, $DB, $00, $23, $00, $C2, $00, $23, $00, $00, $00
UNKNOWN_C3FC49_ENTRY_6:
.BYTE $04, $00, $03, $02, $6A, $01, $04, $02, $14, $00, $05, $02, $F2, $00, $06, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_7:
.BYTE $04, $00, $23, $00, $6A, $01, $23, $00, $14, $00, $23, $00, $F2, $00, $07, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_8:
.BYTE $28, $00, $09, $02, $67, $01, $0A, $02, $01, $00, $08, $02, $C0, $00, $0B, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_9:
.BYTE $28, $00, $15, $02, $67, $01, $23, $00, $01, $00, $14, $02, $C0, $00, $23, $00, $00, $00
UNKNOWN_C3FC49_ENTRY_10:
.BYTE $15, $01, $0C, $02, $74, $01, $0E, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_11:
.BYTE $15, $01, $0D, $02, $74, $01, $0F, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_12:
.BYTE $15, $01, $10, $02, $DC, $00, $12, $02, $00, $00
UNKNOWN_C3FC49_ENTRY_13:
.BYTE $15, $01, $11, $02, $DC, $00, $23, $00, $00, $00

View File

@ -1,16 +0,0 @@
UNKNOWN_C3FD2D:
.DWORD UNKNOWN_C3FC49_ENTRY_0
.DWORD UNKNOWN_C3FC49_ENTRY_2
.DWORD UNKNOWN_C3FC49_ENTRY_4
.DWORD UNKNOWN_C3FC49_ENTRY_6
.DWORD UNKNOWN_C3FC49_ENTRY_8
.DWORD UNKNOWN_C3FC49_ENTRY_10
.DWORD UNKNOWN_C3FC49_ENTRY_12
.DWORD UNKNOWN_C3FC49_ENTRY_1
.DWORD UNKNOWN_C3FC49_ENTRY_3
.DWORD UNKNOWN_C3FC49_ENTRY_5
.DWORD UNKNOWN_C3FC49_ENTRY_7
.DWORD UNKNOWN_C3FC49_ENTRY_9
.DWORD UNKNOWN_C3FC49_ENTRY_11
.DWORD UNKNOWN_C3FC49_ENTRY_13

View File

@ -1,3 +0,0 @@
UNKNOWN_EFEF9F:
.WORD $0000, $7FE0, $1BFF, $18DF, $0000, $681A, $7D6B, $1BE6, $0000, $6800, $021F, $56BF

View File

@ -1,5 +0,0 @@
UNKNOWN_EFF5BB:
.WORD .LOWORD(@UNKNOWN0)
@UNKNOWN0:
.BYTE $F4, $00, $30, $F4, $00, $F4, $01, $30, $FC, $00, $F4, $02, $30, $04, $00, $FC, $03, $30, $F4, $00, $FC, $04, $30, $FC, $00, $FC, $05, $30, $04, $00, $04, $06, $30, $F4, $00, $04, $07, $30, $FC, $00, $04, $08, $30, $04, $80, $00

View File

@ -42,7 +42,7 @@ PREPARE_DYNAMIC_CAST_NAME_TEXT:
LDA @VIRTUAL02
ASL
TAX
LDA UNKNOWN_C3FDB5,X
LDA PARTY_MEMBER_CAST_TILE_IDS,X
TAY
LDX #UNK_SIZE
TDC

View File

@ -54,7 +54,7 @@ PRINT_CAST_NAME_PARTY:
DEC
ASL
TAX
LDA UNKNOWN_C3FDB5,X
LDA PARTY_MEMBER_CAST_TILE_IDS,X
LDX @LOCAL00
JSL PREPARE_CAST_NAME_TILEMAP
LDY #UNK_SIZE

View File

@ -10,7 +10,7 @@ DISPLAY_ANIMATED_NAMING_SPRITE:
STACK_RESERVE_PARAM_INT16 ;int startEntry
END_STACK_VARS
STA @LOCAL04
LOADPTR UNKNOWN_C3FD2D, @VIRTUAL0A
LOADPTR NAMING_SCREEN_ENTITIES, @VIRTUAL0A
LDA @LOCAL04
ASL
ASL

View File

@ -544,7 +544,7 @@ FILE_MENU_LOOP:
TAX
DEC
STA @LOCAL07
LOADPTR UNKNOWN_C3FB1F, @VIRTUAL0A
LOADPTR HP_METER_SPEEDS, @VIRTUAL0A
LDA @LOCAL07
ASL
ASL

View File

@ -667,7 +667,7 @@ FILE_MENU_LOOP:
STA @LOCAL06ALT
TAX
DEX
LOADPTR UNKNOWN_C3FB1F, @VIRTUAL0A
LOADPTR HP_METER_SPEEDS, @VIRTUAL0A
TXA
ASL
ASL

View File

@ -1,8 +1,8 @@
LOAD_KIRBY_SPRITE:
LOAD_DEBUG_CURSOR_GRAPHICS:
BEGIN_C_FUNCTION_FAR
STACK_RESERVE_VARS
STACK_RESERVE_INT32
END_STACK_VARS
COPY_TO_VRAM1 KIRBY, VRAM::OBJ, $200, 0
COPY_TO_VRAM1 DEBUG_CURSOR_GRAPHICS, VRAM::OBJ, $200, 0
END_C_FUNCTION

View File

@ -17,7 +17,7 @@ UNKNOWN_C3F981:
CMP #46
BCS @UNKNOWN1
JSL UNKNOWN_C2DE0F
LOADPTR UNKNOWN_C3F951, @VIRTUAL06
LOADPTR ENEMY_PSI_COLOURS, @VIRTUAL06
LDA @VIRTUAL02
SEC
SBC #35
@ -83,7 +83,7 @@ UNKNOWN_C3F981:
JMP @UNKNOWN8
@UNKNOWN6:
JSL UNKNOWN_C2DE0F
LOADPTR UNKNOWN_C3F951+33, @VIRTUAL06
LOADPTR MISC_SWIRL_COLOURS, @VIRTUAL06
LDA @VIRTUAL02
SEC
SBC #49

View File

@ -9,7 +9,7 @@ UNKNOWN_C4D00F:
STACK_RESERVE_RETURN_INT16
END_STACK_VARS
STA @VIRTUAL02
LOADPTR UNKNOWN_C3FB45, @VIRTUAL06
LOADPTR CONSONANT_VOWEL_TRANSLITERATION_PAIRS, @VIRTUAL06
TYA
ASL
PHA

View File

@ -14,7 +14,7 @@ UNKNOWN_C4D830:
@UNKNOWN1:
LDA WAIT_FOR_NAMING_SCREEN_ACTIONSCRIPT
BNE @UNKNOWN0
LOADPTR UNKNOWN_C3FD2D + (7*4), @VIRTUAL0A
LOADPTR NAMING_SCREEN_ENTITIES + (7*4), @VIRTUAL0A
LDA @LOCAL02
ASL
ASL

View File

@ -23,7 +23,7 @@ GET_DELIVERY_SPRITE_AND_PLACEHOLDER:
AND #$0003
ASL
TAX
LDA UNUSED_FORSALE_SIGN_SPRITE_TABLE,X
LDA FOR_SALE_SIGN_SPRITE_TABLE,X
.IF .DEFINED(JPN)
STA @LOCAL02
.ENDIF

View File

@ -45,7 +45,7 @@ UNKNOWN_EF0EE8:
AND #$0003
ASL
TAX
LDA UNUSED_FORSALE_SIGN_SPRITE_TABLE,X
LDA FOR_SALE_SIGN_SPRITE_TABLE,X
.IF .DEFINED(JPN)
STA @LOCAL02
.ENDIF

View File

@ -31,7 +31,7 @@ UNKNOWN_EFD95E:
STA PALETTES+4
BRA @UNKNOWN2
@UNKNOWN1:
LOADPTR UNKNOWN_EFEF9F, @LOCAL00
LOADPTR DEBUG_FONT_PALETTE, @LOCAL00
LDX #BPP2PALETTE_SIZE * 3
LDA #.LOWORD(PALETTES)
JSL MEMCPY16