z_message progress (#701)

* 8 functions matching, 1 non-matching, 45 untouched

* match func_801518B0

* match func_8014CC14

* matching 8 func, 1 non-matching

* matched func_80148CBC

* matched func_80156758

* matched func_80147564

* matched func_80151BB4

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* WIP func_80151938

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP func_8014EBC

* match func_801518B0

* matched func_80147564

* matched func80152EC0/Message_Spawn_Song_Effect

* matched func_80151C9C

* WIP func_80148B98

* matched func_80151938

* matched func_80148B98

* matched func_80147734

* matched func_80147624

* WIP#2 func_8014EBC

* matched func_80149EBC

* WIP func_8014CCB4

* matched func_8014CCB4

* matched func_80151A68

* WIP func_8014D62C

* fix func_8015A68 signature

* z_message_nes & z_message_staff progress

* z_message_nes & z_message_staff renaming

* documenting z_message

* cleaning & renaming

* documenting MessageContext

* matched func_80151A68

* format

* naming convention fix

* re-add func_80147564

* apply renaming of Message_ShouldAdvanceSilent on the whole project

* re-format, add clang-format off/on in z_message.c needed for matching

* rename staff => credits; add renames in actorfixer.

* change rupees array to ascii

* remove useless comments

* change MessageContext.decodedBuffer to a union

* remove decodedBuffer from actorfixer

* applied AngheloAlf suggestions & ran sfxconvert on z_message.c

* rename message_struct => message_data_static; revert decodedBuffer as union creating differences.

* use true/false instead of 1/0

* use SET_FULLSCREEN_VIEWPORT macro in func_80152c64

* AngheloAlf suggestions.

* extract assign from dayTime calculation for readability in Message_LoadTimeNES

* remove bss_reordering from osFlash, idle & boot_main to typedef MessageTableEntry in message_data_static & make decodedBuffer an union.

* remove useless casts

* Changes hexa to ascii chars when it's meaningful;
add comments to func_8014CCB4 to show what hexa constant means.

* Hensldm suggestions

* ran actorfixer on new changes; fix new bss reordering error introduced with rebase

* use new TIME_TO_MINUTES_F macro

* re-ran format.sh

* hensldm suggestions #2 + overall cleaning

* remove useless parenthesis

* Update include/message_data_static.h

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* actorfixer and format

* more fixes

Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: abaud <adrien.baud@inria.fr>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
This commit is contained in:
Andzura
2022-03-27 17:09:47 +02:00
committed by GitHub
parent 02cb971616
commit 4f3202fd7e
116 changed files with 1377 additions and 574 deletions
+12 -12
View File
@@ -2336,8 +2336,8 @@ asm/non_matchings/code/z_sram_NES/func_80147414.s,func_80147414,0x80147414,0x3E
asm/non_matchings/code/z_sram_NES/Sram_nop8014750C.s,Sram_nop8014750C,0x8014750C,0x5
asm/non_matchings/code/z_message/func_80147520.s,func_80147520,0x80147520,0x11
asm/non_matchings/code/z_message/func_80147564.s,func_80147564,0x80147564,0x30
asm/non_matchings/code/z_message/func_80147624.s,func_80147624,0x80147624,0x44
asm/non_matchings/code/z_message/func_80147734.s,func_80147734,0x80147734,0x20
asm/non_matchings/code/z_message/Message_ShouldAdvance.s,Message_ShouldAdvance,0x80147624,0x44
asm/non_matchings/code/z_message/Message_ShouldAdvanceSilent.s,Message_ShouldAdvanceSilent,0x80147734,0x20
asm/non_matchings/code/z_message/func_801477B4.s,func_801477B4,0x801477B4,0x19
asm/non_matchings/code/z_message/func_80147818.s,func_80147818,0x80147818,0x1C0
asm/non_matchings/code/z_message/func_80147F18.s,func_80147F18,0x80147F18,0x190
@@ -2351,12 +2351,12 @@ asm/non_matchings/code/z_message/func_80149454.s,func_80149454,0x80149454,0x9D
asm/non_matchings/code/z_message/func_801496C8.s,func_801496C8,0x801496C8,0xA5
asm/non_matchings/code/z_message/func_8014995C.s,func_8014995C,0x8014995C,0xAF
asm/non_matchings/code/z_message/func_80149C18.s,func_80149C18,0x80149C18,0xA9
asm/non_matchings/code/z_message/func_80149EBC.s,func_80149EBC,0x80149EBC,0x2E
asm/non_matchings/code/z_message/Message_FindMessage.s,Message_FindMessage,0x80149EBC,0x2E
asm/non_matchings/code/z_message/func_80149F74.s,func_80149F74,0x80149F74,0x2D7
asm/non_matchings/code/z_message/func_8014AAD0.s,func_8014AAD0,0x8014AAD0,0xBB
asm/non_matchings/code/z_message/func_8014ADBC.s,func_8014ADBC,0x8014ADBC,0x654
asm/non_matchings/code/z_message/func_8014C70C.s,func_8014C70C,0x8014C70C,0x142
asm/non_matchings/code/z_message/func_8014CC14.s,func_8014CC14,0x8014CC14,0x28
asm/non_matchings/code/z_message/Message_LoadChar.s,Message_LoadChar,0x8014CC14,0x28
asm/non_matchings/code/z_message/func_8014CCB4.s,func_8014CCB4,0x8014CCB4,0x4F
asm/non_matchings/code/z_message/func_8014CDF0.s,func_8014CDF0,0x8014CDF0,0x7B
asm/non_matchings/code/z_message/func_8014CFDC.s,func_8014CFDC,0x8014CFDC,0xCA
@@ -2388,17 +2388,17 @@ asm/non_matchings/code/z_message/func_80156758.s,func_80156758,0x80156758,0x2D
asm/non_matchings/code/z_message/func_8015680C.s,func_8015680C,0x8015680C,0x7A6
asm/non_matchings/code/z_message/func_801586A4.s,func_801586A4,0x801586A4,0xC
asm/non_matchings/code/z_message/Message_Init.s,Message_Init,0x801586D4,0x7F
asm/non_matchings/code/z_message_nes/func_801588D0.s,func_801588D0,0x801588D0,0x2E
asm/non_matchings/code/z_message_nes/func_80158988.s,func_80158988,0x80158988,0x27
asm/non_matchings/code/z_message_nes/func_80158A24.s,func_80158A24,0x80158A24,0x78
asm/non_matchings/code/z_message_nes/func_80158C04.s,func_80158C04,0x80158C04,0x65
asm/non_matchings/code/z_message_nes/func_80158D98.s,func_80158D98,0x80158D98,0x86
asm/non_matchings/code/z_message_nes/func_80158FB0.s,func_80158FB0,0x80158FB0,0xAF
asm/non_matchings/code/z_message_nes/func_8015926C.s,func_8015926C,0x8015926C,0x73
asm/non_matchings/code/z_message_nes/Message_FindMessageNES.s,Message_FindMessageNES,0x801588D0,0x2E
asm/non_matchings/code/z_message_nes/Message_LoadCharNES.s,Message_LoadCharNES,0x80158988,0x27
asm/non_matchings/code/z_message_nes/Message_LoadPluralRupeesNES.s,Message_LoadPluralRupeesNES,0x80158A24,0x78
asm/non_matchings/code/z_message_nes/Message_LoadLocalizedRupeesNES.s,Message_LoadLocalizedRupeesNES,0x80158C04,0x65
asm/non_matchings/code/z_message_nes/Message_LoadRupeesNES.s,Message_LoadRupeesNES,0x80158D98,0x86
asm/non_matchings/code/z_message_nes/Message_LoadTimeNES.s,Message_LoadTimeNES,0x80158FB0,0xAF
asm/non_matchings/code/z_message_nes/Message_LoadAreaTextNES.s,Message_LoadAreaTextNES,0x8015926C,0x73
asm/non_matchings/code/z_message_nes/func_80159438.s,func_80159438,0x80159438,0x8D
asm/non_matchings/code/z_message_nes/func_8015966C.s,func_8015966C,0x8015966C,0x6CB
asm/non_matchings/code/z_message_nes/func_8015B198.s,func_8015B198,0x8015B198,0xD6E
asm/non_matchings/code/z_message_staff/func_8015E750.s,func_8015E750,0x8015E750,0x27
asm/non_matchings/code/z_message_staff/Message_FindCreditsMessage.s,Message_FindCreditsMessage,0x8015E750,0x27
asm/non_matchings/code/z_message_staff/func_8015E7EC.s,func_8015E7EC,0x8015E7EC,0x42F
asm/non_matchings/code/z_message_staff/func_8015F8A8.s,func_8015F8A8,0x8015F8A8,0x47A
asm/non_matchings/code/z_player_call/PlayerCall_InitFuncPtrs.s,PlayerCall_InitFuncPtrs,0x80160A90,0x1A
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2336 asm/non_matchings/code/z_sram_NES/Sram_nop8014750C.s Sram_nop8014750C 0x8014750C 0x5
2337 asm/non_matchings/code/z_message/func_80147520.s func_80147520 0x80147520 0x11
2338 asm/non_matchings/code/z_message/func_80147564.s func_80147564 0x80147564 0x30
2339 asm/non_matchings/code/z_message/func_80147624.s asm/non_matchings/code/z_message/Message_ShouldAdvance.s func_80147624 Message_ShouldAdvance 0x80147624 0x44
2340 asm/non_matchings/code/z_message/func_80147734.s asm/non_matchings/code/z_message/Message_ShouldAdvanceSilent.s func_80147734 Message_ShouldAdvanceSilent 0x80147734 0x20
2341 asm/non_matchings/code/z_message/func_801477B4.s func_801477B4 0x801477B4 0x19
2342 asm/non_matchings/code/z_message/func_80147818.s func_80147818 0x80147818 0x1C0
2343 asm/non_matchings/code/z_message/func_80147F18.s func_80147F18 0x80147F18 0x190
2351 asm/non_matchings/code/z_message/func_801496C8.s func_801496C8 0x801496C8 0xA5
2352 asm/non_matchings/code/z_message/func_8014995C.s func_8014995C 0x8014995C 0xAF
2353 asm/non_matchings/code/z_message/func_80149C18.s func_80149C18 0x80149C18 0xA9
2354 asm/non_matchings/code/z_message/func_80149EBC.s asm/non_matchings/code/z_message/Message_FindMessage.s func_80149EBC Message_FindMessage 0x80149EBC 0x2E
2355 asm/non_matchings/code/z_message/func_80149F74.s func_80149F74 0x80149F74 0x2D7
2356 asm/non_matchings/code/z_message/func_8014AAD0.s func_8014AAD0 0x8014AAD0 0xBB
2357 asm/non_matchings/code/z_message/func_8014ADBC.s func_8014ADBC 0x8014ADBC 0x654
2358 asm/non_matchings/code/z_message/func_8014C70C.s func_8014C70C 0x8014C70C 0x142
2359 asm/non_matchings/code/z_message/func_8014CC14.s asm/non_matchings/code/z_message/Message_LoadChar.s func_8014CC14 Message_LoadChar 0x8014CC14 0x28
2360 asm/non_matchings/code/z_message/func_8014CCB4.s func_8014CCB4 0x8014CCB4 0x4F
2361 asm/non_matchings/code/z_message/func_8014CDF0.s func_8014CDF0 0x8014CDF0 0x7B
2362 asm/non_matchings/code/z_message/func_8014CFDC.s func_8014CFDC 0x8014CFDC 0xCA
2388 asm/non_matchings/code/z_message/func_8015680C.s func_8015680C 0x8015680C 0x7A6
2389 asm/non_matchings/code/z_message/func_801586A4.s func_801586A4 0x801586A4 0xC
2390 asm/non_matchings/code/z_message/Message_Init.s Message_Init 0x801586D4 0x7F
2391 asm/non_matchings/code/z_message_nes/func_801588D0.s asm/non_matchings/code/z_message_nes/Message_FindMessageNES.s func_801588D0 Message_FindMessageNES 0x801588D0 0x2E
2392 asm/non_matchings/code/z_message_nes/func_80158988.s asm/non_matchings/code/z_message_nes/Message_LoadCharNES.s func_80158988 Message_LoadCharNES 0x80158988 0x27
2393 asm/non_matchings/code/z_message_nes/func_80158A24.s asm/non_matchings/code/z_message_nes/Message_LoadPluralRupeesNES.s func_80158A24 Message_LoadPluralRupeesNES 0x80158A24 0x78
2394 asm/non_matchings/code/z_message_nes/func_80158C04.s asm/non_matchings/code/z_message_nes/Message_LoadLocalizedRupeesNES.s func_80158C04 Message_LoadLocalizedRupeesNES 0x80158C04 0x65
2395 asm/non_matchings/code/z_message_nes/func_80158D98.s asm/non_matchings/code/z_message_nes/Message_LoadRupeesNES.s func_80158D98 Message_LoadRupeesNES 0x80158D98 0x86
2396 asm/non_matchings/code/z_message_nes/func_80158FB0.s asm/non_matchings/code/z_message_nes/Message_LoadTimeNES.s func_80158FB0 Message_LoadTimeNES 0x80158FB0 0xAF
2397 asm/non_matchings/code/z_message_nes/func_8015926C.s asm/non_matchings/code/z_message_nes/Message_LoadAreaTextNES.s func_8015926C Message_LoadAreaTextNES 0x8015926C 0x73
2398 asm/non_matchings/code/z_message_nes/func_80159438.s func_80159438 0x80159438 0x8D
2399 asm/non_matchings/code/z_message_nes/func_8015966C.s func_8015966C 0x8015966C 0x6CB
2400 asm/non_matchings/code/z_message_nes/func_8015B198.s func_8015B198 0x8015B198 0xD6E
2401 asm/non_matchings/code/z_message_staff/func_8015E750.s asm/non_matchings/code/z_message_staff/Message_FindCreditsMessage.s func_8015E750 Message_FindCreditsMessage 0x8015E750 0x27
2402 asm/non_matchings/code/z_message_staff/func_8015E7EC.s func_8015E7EC 0x8015E7EC 0x42F
2403 asm/non_matchings/code/z_message_staff/func_8015F8A8.s func_8015F8A8 0x8015F8A8 0x47A
2404 asm/non_matchings/code/z_player_call/PlayerCall_InitFuncPtrs.s PlayerCall_InitFuncPtrs 0x80160A90 0x1A